diff options
Diffstat (limited to 'src/fs/test_fs_download.c')
-rw-r--r-- | src/fs/test_fs_download.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c index 519923450..c069875cf 100644 --- a/src/fs/test_fs_download.c +++ b/src/fs/test_fs_download.c | |||
@@ -142,18 +142,18 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
142 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: | 142 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: |
143 | fprintf (stdout, | 143 | fprintf (stdout, |
144 | "Publishing complete, %llu kb/s.\n", | 144 | "Publishing complete, %llu kb/s.\n", |
145 | (unsigned long long) (FILESIZE * 1000LL / | 145 | (unsigned long long) (FILESIZE * 1000000LL / |
146 | (1 + | 146 | (1 + |
147 | GNUNET_TIME_absolute_get_duration | 147 | GNUNET_TIME_absolute_get_duration |
148 | (start).rel_value) / 1024LL)); | 148 | (start).rel_value_us) / 1024LL)); |
149 | GAUGER ("FS", | 149 | GAUGER ("FS", |
150 | (GNUNET_YES == indexed) | 150 | (GNUNET_YES == indexed) |
151 | ? "Publishing speed (indexing)" | 151 | ? "Publishing speed (indexing)" |
152 | : "Publishing speed (insertion)", | 152 | : "Publishing speed (insertion)", |
153 | (unsigned long long) (FILESIZE * 1000LL / | 153 | (unsigned long long) (FILESIZE * 1000000LL / |
154 | (1 + | 154 | (1 + |
155 | GNUNET_TIME_absolute_get_duration | 155 | GNUNET_TIME_absolute_get_duration |
156 | (start).rel_value) / 1024LL), "kb/s"); | 156 | (start).rel_value_us) / 1024LL), "kb/s"); |
157 | fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst"); | 157 | fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst"); |
158 | start = GNUNET_TIME_absolute_get (); | 158 | start = GNUNET_TIME_absolute_get (); |
159 | download = | 159 | download = |
@@ -168,18 +168,18 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
168 | case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED: | 168 | case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED: |
169 | fprintf (stdout, | 169 | fprintf (stdout, |
170 | "Download complete, %llu kb/s.\n", | 170 | "Download complete, %llu kb/s.\n", |
171 | (unsigned long long) (FILESIZE * 1000LL / | 171 | (unsigned long long) (FILESIZE * 1000000LL / |
172 | (1 + | 172 | (1 + |
173 | GNUNET_TIME_absolute_get_duration | 173 | GNUNET_TIME_absolute_get_duration |
174 | (start).rel_value) / 1024LL)); | 174 | (start).rel_value_us) / 1024LL)); |
175 | GAUGER ("FS", | 175 | GAUGER ("FS", |
176 | (GNUNET_YES == indexed) | 176 | (GNUNET_YES == indexed) |
177 | ? "Local download speed (indexed)" | 177 | ? "Local download speed (indexed)" |
178 | : "Local download speed (inserted)", | 178 | : "Local download speed (inserted)", |
179 | (unsigned long long) (FILESIZE * 1000LL / | 179 | (unsigned long long) (FILESIZE * 1000000LL / |
180 | (1 + | 180 | (1 + |
181 | GNUNET_TIME_absolute_get_duration | 181 | GNUNET_TIME_absolute_get_duration |
182 | (start).rel_value) / 1024LL), "kb/s"); | 182 | (start).rel_value_us) / 1024LL), "kb/s"); |
183 | GNUNET_SCHEDULER_add_now (&abort_download_task, NULL); | 183 | GNUNET_SCHEDULER_add_now (&abort_download_task, NULL); |
184 | break; | 184 | break; |
185 | case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS: | 185 | case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS: |