[GNUnet-SVN] r32022 - in gnunet/src/ats-tests: . experiments

[gnunet]

Author: wachs
Date: 2014-01-23 17:36:02 +0100 (Thu, 23 Jan 2014)
New Revision: 32022

Modified:
   gnunet/src/ats-tests/ats-testing-experiment.c
   gnunet/src/ats-tests/experiments/test.exp
Log:
enforcing operations


Modified: gnunet/src/ats-tests/ats-testing-experiment.c
===================================================================
--- gnunet/src/ats-tests/ats-testing-experiment.c       2014-01-23 16:25:34 UTC 
(rev 32021)
+++ gnunet/src/ats-tests/ats-testing-experiment.c       2014-01-23 16:36:02 UTC 
(rev 32022)
@@ -121,7 +121,7 @@
     {
       o->type = SET_RATE;
     }
-    else if (0 == strcmp (op, "set_preference "))
+    else if (0 == strcmp (op, "set_preference"))
     {
       o->type = SET_PREFERENCE;
     }
@@ -264,6 +264,57 @@
 }
 
 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;
@@ -288,6 +339,8 @@
   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 +366,7 @@
   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);
 

Modified: gnunet/src/ats-tests/experiments/test.exp
===================================================================
--- gnunet/src/ats-tests/experiments/test.exp   2014-01-23 16:25:34 UTC (rev 
32021)
+++ gnunet/src/ats-tests/experiments/test.exp   2014-01-23 16:36:02 UTC (rev 
32022)
@@ -7,16 +7,26 @@
  
 [episode-0]
 # operations = set_rate, start_send, stop_send, set_preference
+duration = 2 s
 op-0-operation = set_rate
 op-0-value = 10000
 op-0-src = 0
 op-0-dest = 1
 
 op-1-operation = set_rate
-op-1-value = 10000
+op-1-value = 1000
 op-1-src = 0
 op-1-dest = 2
+
+
+[episode-1]
 duration = 2 s
+op-0-operation = set_preference
+op-0-value = 10000
+op-0-src = 0
+op-0-dest = 1
 
-[episode-1]
-duration = 2 s
\ No newline at end of file
+op-1-operation = set_preference
+op-1-value = 10000
+op-1-src = 0
+op-1-dest = 2