diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2010-10-27 09:47:07 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2010-10-27 09:47:07 +0000 |
commit | 92ea81543438aebee77ceec02800da3e4da6a421 (patch) | |
tree | 5f5075ae7e9cc68881fd94f7f98795b755fbd374 /src/fs/test_fs_download.c | |
parent | 4d14bcd5d233c1aeef03b34ec9d4b875a5d7bd2b (diff) | |
download | gnunet-92ea81543438aebee77ceec02800da3e4da6a421.tar.gz gnunet-92ea81543438aebee77ceec02800da3e4da6a421.zip |
Refactoring gnunet time
Diffstat (limited to 'src/fs/test_fs_download.c')
-rw-r--r-- | src/fs/test_fs_download.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/fs/test_fs_download.c b/src/fs/test_fs_download.c index 010b3336d..848c95954 100644 --- a/src/fs/test_fs_download.c +++ b/src/fs/test_fs_download.c | |||
@@ -142,15 +142,15 @@ progress_cb (void *cls, | |||
142 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: | 142 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: |
143 | #if VERBOSE | 143 | #if VERBOSE |
144 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", | 144 | printf ("Publish is progressing (%llu/%llu at level %u off %llu)...\n", |
145 | (unsigned long long) event->value.publish.completed, | 145 | (unsigned long long) event->abs_value.publish.completed, |
146 | (unsigned long long) event->value.publish.size, | 146 | (unsigned long long) event->abs_value.publish.size, |
147 | event->value.publish.specifics.progress.depth, | 147 | event->abs_value.publish.specifics.progress.depth, |
148 | (unsigned long long) event->value.publish.specifics.progress.offset); | 148 | (unsigned long long) event->abs_value.publish.specifics.progress.offset); |
149 | #endif | 149 | #endif |
150 | break; | 150 | break; |
151 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: | 151 | case GNUNET_FS_STATUS_PUBLISH_COMPLETED: |
152 | printf ("Publishing complete, %llu kbps.\n", | 152 | printf ("Publishing complete, %llu kbps.\n", |
153 | (unsigned long long) (FILESIZE * 1000LL / (1+GNUNET_TIME_absolute_get_duration (start).value) / 1024LL)); | 153 | (unsigned long long) (FILESIZE * 1000LL / (1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL)); |
154 | fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst"); | 154 | fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst"); |
155 | start = GNUNET_TIME_absolute_get (); | 155 | start = GNUNET_TIME_absolute_get (); |
156 | download = GNUNET_FS_download_start (fs, | 156 | download = GNUNET_FS_download_start (fs, |
@@ -167,7 +167,7 @@ progress_cb (void *cls, | |||
167 | break; | 167 | break; |
168 | case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED: | 168 | case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED: |
169 | printf ("Download complete, %llu kbps.\n", | 169 | printf ("Download complete, %llu kbps.\n", |
170 | (unsigned long long) (FILESIZE * 1000LL / (1+GNUNET_TIME_absolute_get_duration (start).value) / 1024LL)); | 170 | (unsigned long long) (FILESIZE * 1000LL / (1+GNUNET_TIME_absolute_get_duration (start).rel_value) / 1024LL)); |
171 | GNUNET_SCHEDULER_add_now (sched, | 171 | GNUNET_SCHEDULER_add_now (sched, |
172 | &abort_download_task, | 172 | &abort_download_task, |
173 | NULL); | 173 | NULL); |
@@ -176,10 +176,10 @@ progress_cb (void *cls, | |||
176 | GNUNET_assert (download == event->value.download.dc); | 176 | GNUNET_assert (download == event->value.download.dc); |
177 | #if VERBOSE | 177 | #if VERBOSE |
178 | printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n", | 178 | printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n", |
179 | (unsigned long long) event->value.download.completed, | 179 | (unsigned long long) event->abs_value.download.completed, |
180 | (unsigned long long) event->value.download.size, | 180 | (unsigned long long) event->abs_value.download.size, |
181 | event->value.download.specifics.progress.depth, | 181 | event->abs_value.download.specifics.progress.depth, |
182 | (unsigned long long) event->value.download.specifics.progress.offset); | 182 | (unsigned long long) event->abs_value.download.specifics.progress.offset); |
183 | #endif | 183 | #endif |
184 | break; | 184 | break; |
185 | case GNUNET_FS_STATUS_PUBLISH_ERROR: | 185 | case GNUNET_FS_STATUS_PUBLISH_ERROR: |