diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-08-03 09:35:48 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-08-03 09:35:48 +0000 |
commit | d3e7a5e40dd2d5409009a30e1e41148c4d852673 (patch) | |
tree | 21ff19580a99137e9b8aec4393feb67f0f1c7b5a /src/fs/fs_test_lib.c | |
parent | ec69ceabc67a72373a2579d871c5fe85676a73bd (diff) | |
download | gnunet-d3e7a5e40dd2d5409009a30e1e41148c4d852673.tar.gz gnunet-d3e7a5e40dd2d5409009a30e1e41148c4d852673.zip |
-use simpler, modern scheduler API
Diffstat (limited to 'src/fs/fs_test_lib.c')
-rw-r--r-- | src/fs/fs_test_lib.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c index a848a8bc9..a80793912 100644 --- a/src/fs/fs_test_lib.c +++ b/src/fs/fs_test_lib.c | |||
@@ -245,8 +245,8 @@ publish_progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) | |||
245 | po->publish_timeout_task = NULL; | 245 | po->publish_timeout_task = NULL; |
246 | po->publish_uri = | 246 | po->publish_uri = |
247 | GNUNET_FS_uri_dup (info->value.publish.specifics.completed.chk_uri); | 247 | GNUNET_FS_uri_dup (info->value.publish.specifics.completed.chk_uri); |
248 | GNUNET_SCHEDULER_add_continuation (&report_uri, po, | 248 | GNUNET_SCHEDULER_add_now (&report_uri, |
249 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 249 | po); |
250 | break; | 250 | break; |
251 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: | 251 | case GNUNET_FS_STATUS_PUBLISH_PROGRESS: |
252 | if (po->verbose) | 252 | if (po->verbose) |
@@ -490,10 +490,10 @@ download_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
490 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 490 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
491 | "Timeout while trying to download file\n"); | 491 | "Timeout while trying to download file\n"); |
492 | dop->download_timeout_task = NULL; | 492 | dop->download_timeout_task = NULL; |
493 | GNUNET_FS_download_stop (dop->download_context, GNUNET_YES); | 493 | GNUNET_FS_download_stop (dop->download_context, |
494 | GNUNET_SCHEDULER_add_continuation (dop->download_cont, | 494 | GNUNET_YES); |
495 | dop->download_cont_cls, | 495 | GNUNET_SCHEDULER_add_now (dop->download_cont, |
496 | GNUNET_SCHEDULER_REASON_TIMEOUT); | 496 | dop->download_cont_cls); |
497 | GNUNET_TESTBED_operation_done (dop->fs_op); | 497 | GNUNET_TESTBED_operation_done (dop->fs_op); |
498 | GNUNET_FS_uri_destroy (dop->uri); | 498 | GNUNET_FS_uri_destroy (dop->uri); |
499 | GNUNET_free (dop); | 499 | GNUNET_free (dop); |
@@ -512,10 +512,10 @@ report_success (void *cls, | |||
512 | { | 512 | { |
513 | struct TestDownloadOperation *dop = cls; | 513 | struct TestDownloadOperation *dop = cls; |
514 | 514 | ||
515 | GNUNET_FS_download_stop (dop->download_context, GNUNET_YES); | 515 | GNUNET_FS_download_stop (dop->download_context, |
516 | GNUNET_SCHEDULER_add_continuation (dop->download_cont, | 516 | GNUNET_YES); |
517 | dop->download_cont_cls, | 517 | GNUNET_SCHEDULER_add_now (dop->download_cont, |
518 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | 518 | dop->download_cont_cls); |
519 | GNUNET_TESTBED_operation_done (dop->fs_op); | 519 | GNUNET_TESTBED_operation_done (dop->fs_op); |
520 | GNUNET_FS_uri_destroy (dop->uri); | 520 | GNUNET_FS_uri_destroy (dop->uri); |
521 | GNUNET_free (dop); | 521 | GNUNET_free (dop); |
@@ -529,7 +529,8 @@ report_success (void *cls, | |||
529 | * @param info information about the event | 529 | * @param info information about the event |
530 | */ | 530 | */ |
531 | static void * | 531 | static void * |
532 | download_progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) | 532 | download_progress_cb (void *cls, |
533 | const struct GNUNET_FS_ProgressInfo *info) | ||
533 | { | 534 | { |
534 | struct TestDownloadOperation *dop = cls; | 535 | struct TestDownloadOperation *dop = cls; |
535 | 536 | ||
@@ -537,15 +538,15 @@ download_progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info) | |||
537 | { | 538 | { |
538 | case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS: | 539 | case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS: |
539 | if (dop->verbose) | 540 | if (dop->verbose) |
540 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Download at %llu/%llu bytes\n", | 541 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
542 | "Download at %llu/%llu bytes\n", | ||
541 | (unsigned long long) info->value.download.completed, | 543 | (unsigned long long) info->value.download.completed, |
542 | (unsigned long long) info->value.download.size); | 544 | (unsigned long long) info->value.download.size); |
543 | break; | 545 | break; |
544 | case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED: | 546 | case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED: |
545 | GNUNET_SCHEDULER_cancel (dop->download_timeout_task); | 547 | GNUNET_SCHEDULER_cancel (dop->download_timeout_task); |
546 | dop->download_timeout_task = NULL; | 548 | dop->download_timeout_task = NULL; |
547 | GNUNET_SCHEDULER_add_continuation (&report_success, dop, | 549 | GNUNET_SCHEDULER_add_now (&report_success, dop); |
548 | GNUNET_SCHEDULER_REASON_PREREQ_DONE); | ||
549 | break; | 550 | break; |
550 | case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE: | 551 | case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE: |
551 | case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE: | 552 | case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE: |