From 8a7272d68a0e06dd0b5de7f880246a56b5cab4bf Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Wed, 27 Oct 2010 09:26:58 +0000 Subject: Refactoring gnunet_time --- src/arm/arm_api.c | 4 ++-- src/arm/gnunet-service-arm.c | 8 ++++---- src/arm/gnunet-service-arm_interceptor.c | 8 ++++---- src/arm/test_exponential_backoff.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/arm') 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, #if DEBUG_ARM GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Asked to start service `%s' within %llu ms\n"), service_name, - (unsigned long long) timeout.value); + (unsigned long long) timeout.rel_value); #endif if (0 == strcasecmp ("arm", service_name)) { @@ -706,7 +706,7 @@ GNUNET_ARM_stop_service (struct GNUNET_ARM_Handle *h, GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Stopping service `%s' within %llu ms\n"), service_name, - (unsigned long long) timeout.value); + (unsigned long long) timeout.rel_value); if (h->client == NULL) { 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) if ( (pos->pid == 0) && (GNUNET_YES != in_shutdown) ) { - if (GNUNET_TIME_absolute_get_remaining (pos->restartAt).value == 0) + if (GNUNET_TIME_absolute_get_remaining (pos->restartAt).rel_value == 0) { GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Restarting service `%s'.\n"), pos->name); @@ -792,12 +792,12 @@ delayed_restart_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } pos = pos->next; } - if (lowestRestartDelay.value != GNUNET_TIME_UNIT_FOREVER_REL.value) + if (lowestRestartDelay.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value) { #if DEBUG_ARM GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Will restart process in %llums\n", - (unsigned long long) lowestRestartDelay.value); + (unsigned long long) lowestRestartDelay.rel_value); #endif child_restart_task = GNUNET_SCHEDULER_add_delayed (sched, @@ -902,7 +902,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /* schedule restart */ pos->restartAt = GNUNET_TIME_relative_to_absolute (pos->backoff); - if (pos->backoff.value < EXPONENTIAL_BACKOFF_THRESHOLD) + if (pos->backoff.rel_value < EXPONENTIAL_BACKOFF_THRESHOLD) pos->backoff = GNUNET_TIME_relative_multiply (pos->backoff, 2); 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, GNUNET_a2s (fc->listen_info->service_addr, fc->listen_info->service_addr_len), (unsigned long long) GNUNET_TIME_relative_min (fc->back_off, - rem).value); + rem).abs_value); #endif rem = GNUNET_TIME_absolute_get_remaining (fc->timeout); GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == fc->start_task); @@ -597,7 +597,7 @@ forwardToService (void *cls, GNUNET_a2s (fc->listen_info->service_addr, fc->listen_info->service_addr_len), (unsigned long long) GNUNET_TIME_relative_min (fc->back_off, - rem).value); + rem).abs_value); #endif rem = GNUNET_TIME_absolute_get_remaining (fc->timeout); GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == fc->start_task); @@ -728,7 +728,7 @@ start_forwarding (void *cls, return; } rem = GNUNET_TIME_absolute_get_remaining (fc->timeout); - if (rem.value == 0) + if (rem.rel_value == 0) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Unable to forward to service `%s': timeout before connect\n"), @@ -765,7 +765,7 @@ start_forwarding (void *cls, GNUNET_a2s (fc->listen_info->service_addr, fc->listen_info->service_addr_len), (unsigned long long) GNUNET_TIME_relative_min (fc->back_off, - rem).value); + rem).abs_value); #endif GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == fc->start_task); 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, #if LOG_BACKOFF fprintf(killLogFilePtr, "Waited for: %llu ms\n", - (unsigned long long) waitedFor.value); + (unsigned long long) waitedFor.abs_value); #endif } else { - waitedFor.value = 0; + waitedFor.rel_value = 0; } /* Connect to the doNothing task */ doNothingConnection = GNUNET_CLIENT_connect (sched, "do-nothing", cfg); -- cgit v1.2.3