X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats-tests%2Fats-testing-experiment.c;h=d55adc2d74e5d9ceb07c37fa1292c8902967af9a;hb=7067d8df58abce4636ff94cd3621aee9de1ab594;hp=e7e3cb98201421842236b5c0869ebc17a88f5be1;hpb=30f20a6823e01d794032a201fbef3a3d8285524b;p=oweals%2Fgnunet.git

diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c
index e7e3cb982..d55adc2d7 100644
--- a/src/ats-tests/ats-testing-experiment.c
+++ b/src/ats-tests/ats-testing-experiment.c
@@ -121,7 +121,7 @@ load_episode (struct Experiment *e, struct Episode *cur,
     {
       o->type = SET_RATE;
     }
-    else if (0 == strcmp (op, "set_preference "))
+    else if (0 == strcmp (op, "set_preference"))
     {
       o->type = SET_PREFERENCE;
     }
@@ -259,16 +259,74 @@ timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
   e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK;
   fprintf (stderr, "Experiment timeout!\n");
 
+  if (GNUNET_SCHEDULER_NO_TASK != e->episode_timeout_task)
+  {
+    e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+    GNUNET_SCHEDULER_cancel (e->episode_timeout_task);
+  }
+
   e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time),
       GNUNET_SYSERR);
 }
 
+static void
+enforce_start_send (struct Operation *op)
+{
+  GNUNET_break (0);
+}
+
+static void
+enforce_stop_send (struct Operation *op)
+{
+  GNUNET_break (0);
+}
+
+static void
+enforce_set_rate (struct Operation *op)
+{
+  GNUNET_break (0);
+}
+
+static void
+enforce_set_preference (struct Operation *op)
+{
+  GNUNET_break (0);
+}
+
+static void enforce_episode (struct Episode *ep)
+{
+  struct Operation *cur;
+  for (cur = ep->head; NULL != cur; cur = cur->next)
+  {
+
+    fprintf (stderr, "Enforcing operation: %s [%llu]->[%llu] == %llu\n",
+        print_op (cur->type), cur->src_id, cur->dest_id, cur->value);
+    switch (cur->type) {
+      case START_SEND:
+        enforce_start_send (cur);
+        break;
+      case STOP_SEND:
+        enforce_stop_send (cur);
+        break;
+      case SET_RATE:
+        enforce_set_rate (cur);
+        break;
+      case SET_PREFERENCE:
+        enforce_set_preference (cur);
+        break;
+      default:
+        break;
+    }
+  }
+}
+
 static void
 timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
 {
   struct Experiment *e = cls;
   e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK;
-  e->ep_done_cb (e->cur);
+  if (NULL != e->ep_done_cb)
+    e->ep_done_cb (e->cur);
 
   /* Scheduling next */
   e->cur = e->cur->next;
@@ -288,6 +346,8 @@ timeout_episode (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
   fprintf (stderr, "Running episode %u with timeout %s\n",
       e->cur->id,
       GNUNET_STRINGS_relative_time_to_string(e->cur->duration, GNUNET_YES));
+  enforce_episode(e->cur);
+
   e->episode_timeout_task = GNUNET_SCHEDULER_add_delayed (e->cur->duration,
       &timeout_episode, e);
 }
@@ -313,6 +373,7 @@ GNUNET_ATS_TEST_experimentation_run (struct Experiment *e,
   fprintf (stderr, "Running episode %u with timeout %s\n",
       e->cur->id,
       GNUNET_STRINGS_relative_time_to_string(e->cur->duration, GNUNET_YES));
+  enforce_episode(e->cur);
   e->episode_timeout_task = GNUNET_SCHEDULER_add_delayed (e->cur->duration,
       &timeout_episode, e);