diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:54:06 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:54:06 +0000 |
commit | 5746309cb4be2073d550ad7a6885e918631dbc38 (patch) | |
tree | 89455bc4aadf977816b38df13f990372cd81d71a /src/fs/test_fs_download_indexed.c | |
parent | 6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff) | |
download | gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip |
indentation
Diffstat (limited to 'src/fs/test_fs_download_indexed.c')
-rw-r--r-- | src/fs/test_fs_download_indexed.c | 100 |
1 files changed, 44 insertions, 56 deletions
diff --git a/src/fs/test_fs_download_indexed.c b/src/fs/test_fs_download_indexed.c index 86933352a..5b1752e63 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. | 144 | (unsigned long long) event->value.publish.specifics.progress. |
145 | progress.offset); | 145 | 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 | 152 | GNUNET_TIME_absolute_get_duration (start). |
153 | (start).rel_value) / 1024LL)); | 153 | 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 | 157 | GNUNET_TIME_absolute_get_duration (start). |
158 | (start).rel_value) / 1024LL), "kb/s"); | 158 | 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 = GNUNET_FS_download_start (fs, | 161 | download = |
162 | event->value.publish. | 162 | GNUNET_FS_download_start (fs, |
163 | specifics.completed.chk_uri, NULL, fn, | 163 | event->value.publish.specifics.completed. |
164 | NULL, 0, FILESIZE, 1, | 164 | chk_uri, NULL, fn, NULL, 0, FILESIZE, 1, |
165 | GNUNET_FS_DOWNLOAD_OPTION_NONE, | 165 | GNUNET_FS_DOWNLOAD_OPTION_NONE, "download", |
166 | "download", NULL); | 166 | 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 | 173 | GNUNET_TIME_absolute_get_duration (start). |
174 | (start).rel_value) / 1024LL)); | 174 | 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 | 178 | GNUNET_TIME_absolute_get_duration (start). |
179 | (start).rel_value) / 1024LL), "kb/s"); | 179 | 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,22 +186,19 @@ 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. | 189 | (unsigned long long) event->value.download.specifics.progress. |
190 | progress.offset); | 190 | offset); |
191 | #endif | 191 | #endif |
192 | break; | 192 | break; |
193 | case GNUNET_FS_STATUS_PUBLISH_ERROR: | 193 | case GNUNET_FS_STATUS_PUBLISH_ERROR: |
194 | fprintf (stderr, | 194 | fprintf (stderr, "Error publishing file: %s\n", |
195 | "Error publishing file: %s\n", | ||
196 | event->value.publish.specifics.error.message); | 195 | event->value.publish.specifics.error.message); |
197 | GNUNET_break (0); | 196 | GNUNET_break (0); |
198 | GNUNET_SCHEDULER_add_continuation (&abort_publish_task, | 197 | GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, |
199 | NULL, | ||
200 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 198 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
201 | break; | 199 | break; |
202 | case GNUNET_FS_STATUS_DOWNLOAD_ERROR: | 200 | case GNUNET_FS_STATUS_DOWNLOAD_ERROR: |
203 | fprintf (stderr, | 201 | fprintf (stderr, "Error downloading file: %s\n", |
204 | "Error downloading file: %s\n", | ||
205 | event->value.download.specifics.error.message); | 202 | event->value.download.specifics.error.message); |
206 | GNUNET_SCHEDULER_add_now (&abort_download_task, NULL); | 203 | GNUNET_SCHEDULER_add_now (&abort_download_task, NULL); |
207 | break; | 204 | break; |
@@ -232,8 +229,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event) | |||
232 | break; | 229 | break; |
233 | case GNUNET_FS_STATUS_DOWNLOAD_STOPPED: | 230 | case GNUNET_FS_STATUS_DOWNLOAD_STOPPED: |
234 | GNUNET_assert (download == event->value.download.dc); | 231 | GNUNET_assert (download == event->value.download.dc); |
235 | GNUNET_SCHEDULER_add_continuation (&abort_publish_task, | 232 | GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL, |
236 | NULL, | ||
237 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 233 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); |
238 | break; | 234 | break; |
239 | default: | 235 | default: |
@@ -249,12 +245,13 @@ setup_peer (struct PeerContext *p, const char *cfgname) | |||
249 | { | 245 | { |
250 | p->cfg = GNUNET_CONFIGURATION_create (); | 246 | p->cfg = GNUNET_CONFIGURATION_create (); |
251 | #if START_ARM | 247 | #if START_ARM |
252 | p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", | 248 | p->arm_proc = |
253 | "gnunet-service-arm", | 249 | GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", |
250 | "gnunet-service-arm", | ||
254 | #if VERBOSE | 251 | #if VERBOSE |
255 | "-L", "DEBUG", | 252 | "-L", "DEBUG", |
256 | #endif | 253 | #endif |
257 | "-c", cfgname, NULL); | 254 | "-c", cfgname, NULL); |
258 | #endif | 255 | #endif |
259 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); | 256 | GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); |
260 | } | 257 | } |
@@ -270,8 +267,7 @@ stop_arm (struct PeerContext *p) | |||
270 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); | 267 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); |
271 | if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) | 268 | if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK) |
272 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); | 269 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid"); |
273 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 270 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n", |
274 | "ARM process %u stopped\n", | ||
275 | GNUNET_OS_process_get_pid (p->arm_proc)); | 271 | GNUNET_OS_process_get_pid (p->arm_proc)); |
276 | GNUNET_OS_process_close (p->arm_proc); | 272 | GNUNET_OS_process_close (p->arm_proc); |
277 | p->arm_proc = NULL; | 273 | p->arm_proc = NULL; |
@@ -282,9 +278,8 @@ stop_arm (struct PeerContext *p) | |||
282 | 278 | ||
283 | 279 | ||
284 | static void | 280 | static void |
285 | run (void *cls, | 281 | run (void *cls, char *const *args, const char *cfgfile, |
286 | char *const *args, | 282 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
287 | const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) | ||
288 | { | 283 | { |
289 | const char *keywords[] = { | 284 | const char *keywords[] = { |
290 | "down_foo", | 285 | "down_foo", |
@@ -298,10 +293,8 @@ run (void *cls, | |||
298 | size_t i; | 293 | size_t i; |
299 | 294 | ||
300 | setup_peer (&p1, "test_fs_download_data.conf"); | 295 | setup_peer (&p1, "test_fs_download_data.conf"); |
301 | fs = GNUNET_FS_start (cfg, | 296 | fs = GNUNET_FS_start (cfg, "test-fs-download-indexed", &progress_cb, NULL, |
302 | "test-fs-download-indexed", | 297 | GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); |
303 | &progress_cb, | ||
304 | NULL, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END); | ||
305 | GNUNET_assert (NULL != fs); | 298 | GNUNET_assert (NULL != fs); |
306 | 299 | ||
307 | fn1 = GNUNET_DISK_mktemp ("gnunet-download-indexed-test"); | 300 | fn1 = GNUNET_DISK_mktemp ("gnunet-download-indexed-test"); |
@@ -309,9 +302,7 @@ run (void *cls, | |||
309 | for (i = 0; i < FILESIZE; i++) | 302 | for (i = 0; i < FILESIZE; i++) |
310 | buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256); | 303 | buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256); |
311 | GNUNET_assert (FILESIZE == | 304 | GNUNET_assert (FILESIZE == |
312 | GNUNET_DISK_fn_write (fn1, | 305 | GNUNET_DISK_fn_write (fn1, buf, FILESIZE, |
313 | buf, | ||
314 | FILESIZE, | ||
315 | GNUNET_DISK_PERM_USER_READ | | 306 | GNUNET_DISK_PERM_USER_READ | |
316 | GNUNET_DISK_PERM_USER_WRITE)); | 307 | GNUNET_DISK_PERM_USER_WRITE)); |
317 | GNUNET_free (buf); | 308 | GNUNET_free (buf); |
@@ -321,21 +312,18 @@ run (void *cls, | |||
321 | bo.anonymity_level = 1; | 312 | bo.anonymity_level = 1; |
322 | bo.replication_level = 0; | 313 | bo.replication_level = 0; |
323 | bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME); | 314 | bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME); |
324 | fi = GNUNET_FS_file_information_create_from_file (fs, | 315 | fi = GNUNET_FS_file_information_create_from_file (fs, "publish-context", fn1, |
325 | "publish-context", | 316 | kuri, meta, GNUNET_YES, |
326 | fn1, | 317 | &bo); |
327 | kuri, | ||
328 | meta, GNUNET_YES, &bo); | ||
329 | GNUNET_FS_uri_destroy (kuri); | 318 | GNUNET_FS_uri_destroy (kuri); |
330 | GNUNET_CONTAINER_meta_data_destroy (meta); | 319 | GNUNET_CONTAINER_meta_data_destroy (meta); |
331 | GNUNET_assert (NULL != fi); | 320 | GNUNET_assert (NULL != fi); |
332 | timeout_kill = GNUNET_SCHEDULER_add_delayed (TIMEOUT, | 321 | timeout_kill = |
333 | &timeout_kill_task, NULL); | 322 | GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_kill_task, NULL); |
334 | start = GNUNET_TIME_absolute_get (); | 323 | start = GNUNET_TIME_absolute_get (); |
335 | publish = GNUNET_FS_publish_start (fs, | 324 | publish = |
336 | fi, | 325 | GNUNET_FS_publish_start (fs, fi, NULL, NULL, NULL, |
337 | NULL, NULL, NULL, | 326 | GNUNET_FS_PUBLISH_OPTION_NONE); |
338 | GNUNET_FS_PUBLISH_OPTION_NONE); | ||
339 | GNUNET_assert (publish != NULL); | 327 | GNUNET_assert (publish != NULL); |
340 | } | 328 | } |
341 | 329 | ||
@@ -363,9 +351,9 @@ main (int argc, char *argv[]) | |||
363 | "WARNING", | 351 | "WARNING", |
364 | #endif | 352 | #endif |
365 | NULL); | 353 | NULL); |
366 | GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, | 354 | GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx, |
367 | argvx, "test-fs-download-indexed", | 355 | "test-fs-download-indexed", "nohelp", options, &run, |
368 | "nohelp", options, &run, NULL); | 356 | NULL); |
369 | stop_arm (&p1); | 357 | stop_arm (&p1); |
370 | if (fn1 != NULL) | 358 | if (fn1 != NULL) |
371 | { | 359 | { |