changing time measurement from milliseconds to microseconds

3 files changed, 11 insertions, 12 deletions

diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 4a68a97ea..85cb1f45d 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -547,7 +547,7 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Termination action\n");
         GNUNET_ARM_request_service_stop (h, term, 
-                                         (0 == timeout.rel_value) ? STOP_TIMEOUT : timeout,
+                                         (0 == timeout.rel_value_us) ? STOP_TIMEOUT : timeout,
                                          &term_callback, NULL);
         return;
       }
@@ -557,7 +557,7 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "End action\n");
         GNUNET_ARM_request_service_stop (h, "arm", 
-                                         (0 == timeout.rel_value) ? STOP_TIMEOUT_ARM : timeout,
+                                         (0 == timeout.rel_value_us) ? STOP_TIMEOUT_ARM : timeout,
                                          &stop_callback, NULL);
         return;
       }
@@ -569,7 +569,7 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
         GNUNET_ARM_request_service_start (h, "arm",
             (no_stdout ? 0 : GNUNET_OS_INHERIT_STD_OUT) |
             (no_stderr ? 0 : GNUNET_OS_INHERIT_STD_ERR),
-            (0 == timeout.rel_value) ? START_TIMEOUT: timeout,
+            (0 == timeout.rel_value_us) ? START_TIMEOUT: timeout,
             start_callback, NULL);
         return;
       }
@@ -579,7 +579,7 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Initialization action\n");
         GNUNET_ARM_request_service_start (h, init, GNUNET_OS_INHERIT_STD_NONE,
-                                          (0 == timeout.rel_value) ? STOP_TIMEOUT : timeout,
+                                          (0 == timeout.rel_value_us) ? STOP_TIMEOUT : timeout,
                                           &init_callback, NULL);
         return;
       }
@@ -590,7 +590,7 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                     "Going to list all running services controlled by ARM.\n"); 
         GNUNET_ARM_request_service_list (h,
-                                         (0 == timeout.rel_value) ? LIST_TIMEOUT : timeout,
+                                         (0 == timeout.rel_value_us) ? LIST_TIMEOUT : timeout,
                                          &list_callback, &list);
         return;
       }    
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 1acb82f72..f5426e176 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -1012,8 +1012,7 @@ delayed_restart_task (void *cls,
     if (NULL != sl->proc)
       continue;
     /* service is currently not running */
-    if (GNUNET_TIME_absolute_get_remaining (sl->restart_at).rel_value ==
-        0)
+    if (0 == GNUNET_TIME_absolute_get_remaining (sl->restart_at).rel_value_us)
     {
       /* restart is now allowed */
       if (sl->is_default)
@@ -1046,7 +1045,7 @@ delayed_restart_task (void *cls,
                                   (sl->restart_at));
     }
   }
-  if (lowestRestartDelay.rel_value != GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
+  if (lowestRestartDelay.rel_value_us != GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
                 "Will restart process in %s\n",
@@ -1126,7 +1125,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
         statstr = _( /* process termination method */ "unknown");
         statcode = 0;
       }
-      if (0 != pos->killed_at.abs_value)
+      if (0 != pos->killed_at.abs_value_us)
       {
         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                     _("Service `%s' took %s to terminate\n"),
@@ -1149,7 +1148,7 @@ maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
         if ((statusType == GNUNET_OS_PROCESS_EXITED) && (statcode == 0))
         {
           /* process terminated normally, allow restart at any time */
-          pos->restart_at.abs_value = 0;
+          pos->restart_at.abs_value_us = 0;
           GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               _("Service `%s' terminated normally, will restart at any time\n"),
               pos->name);
diff --git a/src/arm/test_exponential_backoff.c b/src/arm/test_exponential_backoff.c
index c61bc2eec..7d8d771a2 100644
--- a/src/arm/test_exponential_backoff.c
+++ b/src/arm/test_exponential_backoff.c
@@ -250,7 +250,7 @@ kill_task (void *cbData, const struct GNUNET_SCHEDULER_TaskContext *tc)
   }
   else
   {
-    waitedFor.rel_value = 0;
+    waitedFor.rel_value_us = 0;
   }
   /* Connect to the doNothing task */
   doNothingConnection = GNUNET_CLIENT_connect ("do-nothing", cfg);
@@ -261,7 +261,7 @@ kill_task (void *cbData, const struct GNUNET_SCHEDULER_TaskContext *tc)
   {
     GNUNET_CLIENT_disconnect (doNothingConnection);
     GNUNET_ARM_request_service_stop (arm, "do-nothing", TIMEOUT, NULL, NULL);
-    if (waitedFor_prev.rel_value >= waitedFor.rel_value)
+    if (waitedFor_prev.rel_value_us >= waitedFor.rel_value_us)
       ok = 9;
     else
       ok = 0;