diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2010-10-27 09:26:58 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2010-10-27 09:26:58 +0000 |
commit | 8a7272d68a0e06dd0b5de7f880246a56b5cab4bf (patch) | |
tree | 71a67f0eb4458462d66f70d73949249f6d6f0361 /src | |
parent | 6f77f858261ae4c12b3da9a715c76bf529a7509f (diff) | |
download | gnunet-8a7272d68a0e06dd0b5de7f880246a56b5cab4bf.tar.gz gnunet-8a7272d68a0e06dd0b5de7f880246a56b5cab4bf.zip |
Refactoring gnunet_time
Diffstat (limited to 'src')
-rw-r--r-- | src/arm/arm_api.c | 4 | ||||
-rw-r--r-- | src/arm/gnunet-service-arm.c | 8 | ||||
-rw-r--r-- | src/arm/gnunet-service-arm_interceptor.c | 8 | ||||
-rw-r--r-- | src/arm/test_exponential_backoff.c | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c index 66747a624..dda5561ac 100644 --- a/src/arm/arm_api.c +++ b/src/arm/arm_api.c | |||
@@ -636,7 +636,7 @@ GNUNET_ARM_start_service (struct GNUNET_ARM_Handle *h, | |||
636 | #if DEBUG_ARM | 636 | #if DEBUG_ARM |
637 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 637 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
638 | _("Asked to start service `%s' within %llu ms\n"), service_name, | 638 | _("Asked to start service `%s' within %llu ms\n"), service_name, |
639 | (unsigned long long) timeout.value); | 639 | (unsigned long long) timeout.rel_value); |
640 | #endif | 640 | #endif |
641 | if (0 == strcasecmp ("arm", service_name)) | 641 | if (0 == strcasecmp ("arm", service_name)) |
642 | { | 642 | { |
@@ -706,7 +706,7 @@ GNUNET_ARM_stop_service (struct GNUNET_ARM_Handle *h, | |||
706 | 706 | ||
707 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 707 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
708 | _("Stopping service `%s' within %llu ms\n"), service_name, | 708 | _("Stopping service `%s' within %llu ms\n"), service_name, |
709 | (unsigned long long) timeout.value); | 709 | (unsigned long long) timeout.rel_value); |
710 | if (h->client == NULL) | 710 | if (h->client == NULL) |
711 | { | 711 | { |
712 | client = GNUNET_CLIENT_connect (h->sched, "arm", h->cfg); | 712 | client = GNUNET_CLIENT_connect (h->sched, "arm", h->cfg); |
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 4ee19ef3d..2eb21a068 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -776,7 +776,7 @@ delayed_restart_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
776 | if ( (pos->pid == 0) && | 776 | if ( (pos->pid == 0) && |
777 | (GNUNET_YES != in_shutdown) ) | 777 | (GNUNET_YES != in_shutdown) ) |
778 | { | 778 | { |
779 | if (GNUNET_TIME_absolute_get_remaining (pos->restartAt).value == 0) | 779 | if (GNUNET_TIME_absolute_get_remaining (pos->restartAt).rel_value == 0) |
780 | { | 780 | { |
781 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 781 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
782 | _("Restarting service `%s'.\n"), pos->name); | 782 | _("Restarting service `%s'.\n"), pos->name); |
@@ -792,12 +792,12 @@ delayed_restart_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
792 | } | 792 | } |
793 | pos = pos->next; | 793 | pos = pos->next; |
794 | } | 794 | } |
795 | if (lowestRestartDelay.value != GNUNET_TIME_UNIT_FOREVER_REL.value) | 795 | if (lowestRestartDelay.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value) |
796 | { | 796 | { |
797 | #if DEBUG_ARM | 797 | #if DEBUG_ARM |
798 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 798 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
799 | "Will restart process in %llums\n", | 799 | "Will restart process in %llums\n", |
800 | (unsigned long long) lowestRestartDelay.value); | 800 | (unsigned long long) lowestRestartDelay.rel_value); |
801 | #endif | 801 | #endif |
802 | child_restart_task | 802 | child_restart_task |
803 | = GNUNET_SCHEDULER_add_delayed (sched, | 803 | = GNUNET_SCHEDULER_add_delayed (sched, |
@@ -902,7 +902,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
902 | /* schedule restart */ | 902 | /* schedule restart */ |
903 | pos->restartAt | 903 | pos->restartAt |
904 | = GNUNET_TIME_relative_to_absolute (pos->backoff); | 904 | = GNUNET_TIME_relative_to_absolute (pos->backoff); |
905 | if (pos->backoff.value < EXPONENTIAL_BACKOFF_THRESHOLD) | 905 | if (pos->backoff.rel_value < EXPONENTIAL_BACKOFF_THRESHOLD) |
906 | pos->backoff | 906 | pos->backoff |
907 | = GNUNET_TIME_relative_multiply (pos->backoff, 2); | 907 | = GNUNET_TIME_relative_multiply (pos->backoff, 2); |
908 | if (GNUNET_SCHEDULER_NO_TASK != child_restart_task) | 908 | if (GNUNET_SCHEDULER_NO_TASK != child_restart_task) |
diff --git a/src/arm/gnunet-service-arm_interceptor.c b/src/arm/gnunet-service-arm_interceptor.c index bc0c260a4..cddde57fb 100644 --- a/src/arm/gnunet-service-arm_interceptor.c +++ b/src/arm/gnunet-service-arm_interceptor.c | |||
@@ -503,7 +503,7 @@ receiveFromService (void *cls, | |||
503 | GNUNET_a2s (fc->listen_info->service_addr, | 503 | GNUNET_a2s (fc->listen_info->service_addr, |
504 | fc->listen_info->service_addr_len), | 504 | fc->listen_info->service_addr_len), |
505 | (unsigned long long) GNUNET_TIME_relative_min (fc->back_off, | 505 | (unsigned long long) GNUNET_TIME_relative_min (fc->back_off, |
506 | rem).value); | 506 | rem).abs_value); |
507 | #endif | 507 | #endif |
508 | rem = GNUNET_TIME_absolute_get_remaining (fc->timeout); | 508 | rem = GNUNET_TIME_absolute_get_remaining (fc->timeout); |
509 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == fc->start_task); | 509 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == fc->start_task); |
@@ -597,7 +597,7 @@ forwardToService (void *cls, | |||
597 | GNUNET_a2s (fc->listen_info->service_addr, | 597 | GNUNET_a2s (fc->listen_info->service_addr, |
598 | fc->listen_info->service_addr_len), | 598 | fc->listen_info->service_addr_len), |
599 | (unsigned long long) GNUNET_TIME_relative_min (fc->back_off, | 599 | (unsigned long long) GNUNET_TIME_relative_min (fc->back_off, |
600 | rem).value); | 600 | rem).abs_value); |
601 | #endif | 601 | #endif |
602 | rem = GNUNET_TIME_absolute_get_remaining (fc->timeout); | 602 | rem = GNUNET_TIME_absolute_get_remaining (fc->timeout); |
603 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == fc->start_task); | 603 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == fc->start_task); |
@@ -728,7 +728,7 @@ start_forwarding (void *cls, | |||
728 | return; | 728 | return; |
729 | } | 729 | } |
730 | rem = GNUNET_TIME_absolute_get_remaining (fc->timeout); | 730 | rem = GNUNET_TIME_absolute_get_remaining (fc->timeout); |
731 | if (rem.value == 0) | 731 | if (rem.rel_value == 0) |
732 | { | 732 | { |
733 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 733 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
734 | _("Unable to forward to service `%s': timeout before connect\n"), | 734 | _("Unable to forward to service `%s': timeout before connect\n"), |
@@ -765,7 +765,7 @@ start_forwarding (void *cls, | |||
765 | GNUNET_a2s (fc->listen_info->service_addr, | 765 | GNUNET_a2s (fc->listen_info->service_addr, |
766 | fc->listen_info->service_addr_len), | 766 | fc->listen_info->service_addr_len), |
767 | (unsigned long long) GNUNET_TIME_relative_min (fc->back_off, | 767 | (unsigned long long) GNUNET_TIME_relative_min (fc->back_off, |
768 | rem).value); | 768 | rem).abs_value); |
769 | #endif | 769 | #endif |
770 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == fc->start_task); | 770 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == fc->start_task); |
771 | fc->start_task | 771 | fc->start_task |
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c index e71d96b48..dd32f6a5d 100644 --- a/src/arm/test_exponential_backoff.c +++ b/src/arm/test_exponential_backoff.c | |||
@@ -361,12 +361,12 @@ kill_task (void *cbData, | |||
361 | #if LOG_BACKOFF | 361 | #if LOG_BACKOFF |
362 | fprintf(killLogFilePtr, | 362 | fprintf(killLogFilePtr, |
363 | "Waited for: %llu ms\n", | 363 | "Waited for: %llu ms\n", |
364 | (unsigned long long) waitedFor.value); | 364 | (unsigned long long) waitedFor.abs_value); |
365 | #endif | 365 | #endif |
366 | } | 366 | } |
367 | else | 367 | else |
368 | { | 368 | { |
369 | waitedFor.value = 0; | 369 | waitedFor.rel_value = 0; |
370 | } | 370 | } |
371 | /* Connect to the doNothing task */ | 371 | /* Connect to the doNothing task */ |
372 | doNothingConnection = GNUNET_CLIENT_connect (sched, "do-nothing", cfg); | 372 | doNothingConnection = GNUNET_CLIENT_connect (sched, "do-nothing", cfg); |