changing time measurement from milliseconds to microseconds

2 files changed, 12 insertions, 12 deletions

diff --git a/src/experimentation/gnunet-daemon-experimentation_experiments.c b/src/experimentation/gnunet-daemon-experimentation_experiments.c
index 99348a2cb..891865b39 100644
--- a/src/experimentation/gnunet-daemon-experimentation_experiments.c
+++ b/src/experimentation/gnunet-daemon-experimentation_experiments.c
@@ -158,7 +158,7 @@ find_it (void *cls,
 
         if (0 != strcmp(e->name, find_ctx->name))
                 return GNUNET_OK;
-        if (e->version.abs_value != find_ctx->version.abs_value)
+        if (e->version.abs_value_us != find_ctx->version.abs_value_us)
                 return GNUNET_OK;
 
         find_ctx->res = e;
@@ -272,8 +272,8 @@ int GNUNET_EXPERIMENTATION_experiments_add (struct Issuer *i,
                         e->name,
                         GNUNET_STRINGS_absolute_time_to_string (start),
                         GNUNET_STRINGS_absolute_time_to_string (stop),
-                        (long long unsigned int) frequency.rel_value / 1000,
-                        (long long unsigned int) duration.rel_value / 1000);
+                        (long long unsigned int) frequency.rel_value_us / 1000000LL,
+                        (long long unsigned int) duration.rel_value_us / 1000000LL);
         GNUNET_CONTAINER_multihashmap_put (experiments, &e->issuer.hashPubKey, e, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
   GNUNET_STATISTICS_set (GED_stats, "# experiments", GNUNET_CONTAINER_multihashmap_size (experiments), GNUNET_NO);
 
@@ -336,7 +336,7 @@ void exp_file_iterator (void *cls,
                         GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Experiment `%s': Version missing or invalid \n"), name);
                         return;
         }
-        version.abs_value = number;
+        version.abs_value_us = number; // FIXME: what is this supposed to be? Version != TIME!???
 
         /* Required capabilities */
         if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "CAPABILITIES", &number))
@@ -358,14 +358,14 @@ void exp_file_iterator (void *cls,
 
 
 
-        if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "START", (long long unsigned int *) &start.abs_value))
+        if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "START", (long long unsigned int *) &start.abs_value_us))
                         start = GNUNET_TIME_UNIT_ZERO_ABS;
 
         if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time (exp, name, "FREQUENCY", &frequency))
                         frequency = EXP_DEFAULT_EXP_FREQ;
         if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time (exp, name, "DURATION", &duration))
                         duration = EXP_DEFAULT_EXP_DUR;
-        if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "STOP", (long long unsigned int *)&stop.abs_value))
+        if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (exp, name, "STOP", (long long unsigned int *)&stop.abs_value_us))
                         stop = GNUNET_TIME_UNIT_FOREVER_ABS;
 
         GNUNET_EXPERIMENTATION_experiments_add (i, name, issuer, version,
diff --git a/src/experimentation/gnunet-daemon-experimentation_scheduler.c b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
index 784baa4d4..34142fabb 100644
--- a/src/experimentation/gnunet-daemon-experimentation_scheduler.c
+++ b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
@@ -133,7 +133,7 @@ static void run_experiment_inbound (void *cls,const struct GNUNET_SCHEDULER_Task
                         se->state = REQUESTED;
                         /* Schedule to run */
                         start = GNUNET_TIME_absolute_get_remaining(se->e->start);
-                        if (0 == start.rel_value)
+                        if (0 == start.rel_value_us)
                                         se->task = GNUNET_SCHEDULER_add_now (&run_experiment_inbound, se);
                         else
                                         se->task = GNUNET_SCHEDULER_add_delayed (start, &run_experiment_inbound, se);
@@ -155,7 +155,7 @@ static void run_experiment_inbound (void *cls,const struct GNUNET_SCHEDULER_Task
 
                         /* Reschedule */
                         end = GNUNET_TIME_absolute_get_remaining(GNUNET_TIME_absolute_add (se->e->stop, se->e->frequency));
-                        if (0 == end.rel_value)
+                        if (0 == end.rel_value_us)
                         {
                                 se->state = STOPPED;
                                 return; /* End of experiment is reached */
@@ -201,7 +201,7 @@ static void run_experiment_outbound (void *cls,const struct GNUNET_SCHEDULER_Tas
 
                         /* Reschedule */
                         end = GNUNET_TIME_absolute_get_remaining(GNUNET_TIME_absolute_add (se->e->stop, se->e->frequency));
-                        if (0 == end.rel_value)
+                        if (0 == end.rel_value_us)
                         {
                                 se->state = STOPPED;
                                 return; /* End of experiment is reached */
@@ -328,7 +328,7 @@ GED_scheduler_add (struct Node *n, struct Experiment *e, int outbound)
 
         start = GNUNET_TIME_absolute_get_remaining(e->start);
         end = GNUNET_TIME_absolute_get_remaining(e->stop);
-        if (0 == end.rel_value)
+        if (0 == end.rel_value_us)
                         return; /* End of experiment is reached */
 
         /* Add additional checks here if required */
@@ -340,7 +340,7 @@ GED_scheduler_add (struct Node *n, struct Experiment *e, int outbound)
 
         if (GNUNET_YES == outbound)
         {
-                if (0 == start.rel_value)
+          if (0 == start.rel_value_us)
                                 se->task = GNUNET_SCHEDULER_add_now (&run_experiment_outbound, se);
                 else
                                 se->task = GNUNET_SCHEDULER_add_delayed (start, &run_experiment_outbound, se);
@@ -348,7 +348,7 @@ GED_scheduler_add (struct Node *n, struct Experiment *e, int outbound)
         }
         else
         {
-                if (0 == start.rel_value)
+                if (0 == start.rel_value_us)
                                 se->task = GNUNET_SCHEDULER_add_now (&run_experiment_inbound, se);
                 else
                                 se->task = GNUNET_SCHEDULER_add_delayed (start, &run_experiment_inbound, se);