diff options
Diffstat (limited to 'src/fs/test_fs_download_indexed.c')
-rw-r--r-- | src/fs/test_fs_download_indexed.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/fs/test_fs_download_indexed.c b/src/fs/test_fs_download_indexed.c index 5b1752e63..1811b325d 100644 --- a/src/fs/test_fs_download_indexed.c +++ b/src/fs/test_fs_download_indexed.c | |||
@@ -141,42 +141,42 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
141 | (unsigned long long) event->value.publish.completed, | 141 | (unsigned long long) event->value.publish.completed, |
142 | (unsigned long long) event->value.publish.size, | 142 | (unsigned long long) event->value.publish.size, |
143 | event->value.publish.specifics.progress.depth, | 143 | event->value.publish.specifics.progress.depth, |
144 | (unsigned long long) event->value.publish.specifics.progress. | 144 | (unsigned long long) event->value.publish.specifics. |
145 | offset); | 145 | progress.offset); |
146 | #endif | 146 | #endif |
147 | break; | 147 | break; |
148 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: | 148 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: |
149 | printf ("Publishing complete, %llu kbps.\n", | 149 | printf ("Publishing complete, %llu kbps.\n", |
150 | (unsigned long long) (FILESIZE * 1000LL / | 150 | (unsigned long long) (FILESIZE * 1000LL / |
151 | (1 + | 151 | (1 + |
152 | GNUNET_TIME_absolute_get_duration (start). | 152 | GNUNET_TIME_absolute_get_duration |
153 | rel_value) / 1024LL)); | 153 | (start).rel_value) / 1024LL)); |
154 | GAUGER ("FS", "Publishing speed (indexing)", | 154 | GAUGER ("FS", "Publishing speed (indexing)", |
155 | (unsigned long long) (FILESIZE * 1000LL / | 155 | (unsigned long long) (FILESIZE * 1000LL / |
156 | (1 + | 156 | (1 + |
157 | GNUNET_TIME_absolute_get_duration (start). | 157 | GNUNET_TIME_absolute_get_duration |
158 | rel_value) / 1024LL), "kb/s"); | 158 | (start).rel_value) / 1024LL), "kb/s"); |
159 | fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst"); | 159 | fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst"); |
160 | start = GNUNET_TIME_absolute_get (); | 160 | start = GNUNET_TIME_absolute_get (); |
161 | download = | 161 | download = |
162 | GNUNET_FS_download_start (fs, | 162 | GNUNET_FS_download_start (fs, |
163 | event->value.publish.specifics.completed. | 163 | event->value.publish.specifics. |
164 | chk_uri, NULL, fn, NULL, 0, FILESIZE, 1, | 164 | completed.chk_uri, NULL, fn, NULL, 0, |
165 | GNUNET_FS_DOWNLOAD_OPTION_NONE, "download", | 165 | FILESIZE, 1, GNUNET_FS_DOWNLOAD_OPTION_NONE, |
166 | NULL); | 166 | "download", NULL); |
167 | GNUNET_assert (download != NULL); | 167 | GNUNET_assert (download != NULL); |
168 | break; | 168 | break; |
169 | case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED: | 169 | case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED: |
170 | printf ("Download complete, %llu kbps.\n", | 170 | printf ("Download complete, %llu kbps.\n", |
171 | (unsigned long long) (FILESIZE * 1000LL / | 171 | (unsigned long long) (FILESIZE * 1000LL / |
172 | (1 + | 172 | (1 + |
173 | GNUNET_TIME_absolute_get_duration (start). | 173 | GNUNET_TIME_absolute_get_duration |
174 | rel_value) / 1024LL)); | 174 | (start).rel_value) / 1024LL)); |
175 | GAUGER ("FS", "Local download speed (indexed)", | 175 | GAUGER ("FS", "Local download speed (indexed)", |
176 | (unsigned long long) (FILESIZE * 1000LL / | 176 | (unsigned long long) (FILESIZE * 1000LL / |
177 | (1 + | 177 | (1 + |
178 | GNUNET_TIME_absolute_get_duration (start). | 178 | GNUNET_TIME_absolute_get_duration |
179 | rel_value) / 1024LL), "kb/s"); | 179 | (start).rel_value) / 1024LL), "kb/s"); |
180 | GNUNET_SCHEDULER_add_now (&abort_download_task, NULL); | 180 | GNUNET_SCHEDULER_add_now (&abort_download_task, NULL); |
181 | break; | 181 | break; |
182 | case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS: | 182 | case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS: |
@@ -186,8 +186,8 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
186 | (unsigned long long) event->value.download.completed, | 186 | (unsigned long long) event->value.download.completed, |
187 | (unsigned long long) event->value.download.size, | 187 | (unsigned long long) event->value.download.size, |
188 | event->value.download.specifics.progress.depth, | 188 | event->value.download.specifics.progress.depth, |
189 | (unsigned long long) event->value.download.specifics.progress. | 189 | (unsigned long long) event->value.download.specifics. |
190 | offset); | 190 | progress.offset); |
191 | #endif | 191 | #endif |
192 | break; | 192 | break; |
193 | case GNUNET_FS_STATUS_PUBLISH_ERROR: | 193 | case GNUNET_FS_STATUS_PUBLISH_ERROR: |