- remove adjust

[oweals/gnunet.git] / src / experimentation / gnunet-daemon-experimentation_scheduler.c

diff --git a/src/experimentation/gnunet-daemon-experimentation_scheduler.c b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
index 784baa4d422a9f09c0d41accabb6fede0d8a55a3..c13434e9be88c4bda8bffd31d7e7ad2602da39c0 100644 (file)
--- a/src/experimentation/gnunet-daemon-experimentation_scheduler.c
+++ b/src/experimentation/gnunet-daemon-experimentation_scheduler.c
@@ -25,7 +25,6 @@
  * @author Matthias Wachs
  */
 #include "platform.h"
-#include "gnunet_getopt_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_core_service.h"
 #include "gnunet_statistics_service.h"
@@ -133,7 +132,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 +154,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 +200,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 */
@@ -227,21 +226,20 @@ static void run_experiment_outbound (void *cls,const struct GNUNET_SCHEDULER_Tas
 void
 GED_scheduler_handle_start (struct Node *n, struct Experiment *e)
 {
-       struct ScheduledExperiment *se;
-
-       if ((NULL != (se = find_experiment (waiting_in_head, waiting_in_tail, n, e, GNUNET_NO))) ||
-                (NULL != (se = find_experiment (running_in_head, running_in_tail, n, e, GNUNET_NO))))
-       {
-               GNUNET_break_op (0);
-               return;
-       }
-
-       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %s message from peer %s for experiment `%s'\n",
-                       "START", GNUNET_i2s (&n->id), e->name);
-
-       GED_scheduler_add (n, e, GNUNET_NO);
+  if ((NULL != find_experiment (waiting_in_head, waiting_in_tail, n, e, GNUNET_NO)) ||
+      (NULL != find_experiment (running_in_head, running_in_tail, n, e, GNUNET_NO)))
+  {
+    GNUNET_break_op (0);
+    return;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Received %s message from peer %s for experiment `%s'\n",
+             "START", GNUNET_i2s (&n->id), e->name);
+  GED_scheduler_add (n, e, GNUNET_NO);
 }
 
+
 /**
  * Handle a START_ACK message from a remote node
  *
@@ -328,11 +326,11 @@ 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 */
-       se = GNUNET_malloc (sizeof (struct ScheduledExperiment));
+       se = GNUNET_new (struct ScheduledExperiment);
        se->state = NOT_RUNNING;
        se->outbound = outbound;
        se->e = e;
@@ -340,7 +338,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 +346,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);