[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13415 - gnunet/src/arm
From: |
gnunet |
Subject: |
[GNUnet-SVN] r13415 - gnunet/src/arm |
Date: |
Wed, 27 Oct 2010 11:26:58 +0200 |
Author: wachs
Date: 2010-10-27 11:26:58 +0200 (Wed, 27 Oct 2010)
New Revision: 13415
Modified:
gnunet/src/arm/arm_api.c
gnunet/src/arm/gnunet-service-arm.c
gnunet/src/arm/gnunet-service-arm_interceptor.c
gnunet/src/arm/test_exponential_backoff.c
Log:
Refactoring gnunet_time
Modified: gnunet/src/arm/arm_api.c
===================================================================
--- gnunet/src/arm/arm_api.c 2010-10-27 09:22:31 UTC (rev 13414)
+++ gnunet/src/arm/arm_api.c 2010-10-27 09:26:58 UTC (rev 13415)
@@ -636,7 +636,7 @@
#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_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);
Modified: gnunet/src/arm/gnunet-service-arm.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm.c 2010-10-27 09:22:31 UTC (rev 13414)
+++ gnunet/src/arm/gnunet-service-arm.c 2010-10-27 09:26:58 UTC (rev 13415)
@@ -776,7 +776,7 @@
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 @@
}
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 @@
/* 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)
Modified: gnunet/src/arm/gnunet-service-arm_interceptor.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm_interceptor.c 2010-10-27 09:22:31 UTC
(rev 13414)
+++ gnunet/src/arm/gnunet-service-arm_interceptor.c 2010-10-27 09:26:58 UTC
(rev 13415)
@@ -503,7 +503,7 @@
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 @@
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 @@
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 @@
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
Modified: gnunet/src/arm/test_exponential_backoff.c
===================================================================
--- gnunet/src/arm/test_exponential_backoff.c 2010-10-27 09:22:31 UTC (rev
13414)
+++ gnunet/src/arm/test_exponential_backoff.c 2010-10-27 09:26:58 UTC (rev
13415)
@@ -361,12 +361,12 @@
#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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13415 - gnunet/src/arm,
gnunet <=