new logging functionality

1 files changed, 140 insertions, 8 deletions

diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c
index d0e74d1c3..fca374324 100644
--- a/src/ats-tests/ats-testing-experiment.c
+++ b/src/ats-tests/ats-testing-experiment.c
@@ -35,20 +35,141 @@ create_experiment ()
   e->name = NULL;
   e->num_masters = 0;
   e->num_slaves = 0;
-
+  e->start = NULL;
+  e->total_duration = GNUNET_TIME_UNIT_ZERO;
   return e;
 }
 
 static void
 free_experiment (struct Experiment *e)
 {
+  struct Episode *cur;
+  struct Episode *next;
+
+  next = e->start;
+  for (cur = next; NULL != cur; cur = next)
+  {
+    next = cur->next;
+    GNUNET_free (cur);
+  }
+
   GNUNET_free_non_null (e->name);
   GNUNET_free_non_null (e->cfg_file);
   GNUNET_free (e);
 }
 
+static int
+load_episodes (struct Experiment *e, struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  int e_counter = 0;
+  char *sec_name;
+  struct GNUNET_TIME_Relative e_duration;
+  struct Episode *cur;
+  struct Episode *last;
+
+  e_counter = 0;
+  last = NULL;
+  while (1)
+  {
+    GNUNET_asprintf(&sec_name, "episode-%u", e_counter);
+    if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time(cfg,
+        sec_name, "duration", &e_duration))
+    {
+      GNUNET_free (sec_name);
+      break;
+    }
+
+    cur = GNUNET_new (struct Episode);
+    cur->duration = e_duration;
+    cur->id = e_counter;
+
+    fprintf (stderr, "Found episode %u with duration %s \n",
+        e_counter,
+        GNUNET_STRINGS_relative_time_to_string(cur->duration, GNUNET_YES));
+
+    /* Update experiment */
+    e->num_episodes ++;
+    e->total_duration = GNUNET_TIME_relative_add(e->total_duration, cur->duration);
+    /* Put in linked list */
+    if (NULL == last)
+      e->start = cur;
+    else
+    last->next = cur;
+
+    GNUNET_free (sec_name);
+    e_counter ++;
+    last = cur;
+  }
+  return e_counter;
+}
+
+static void
+timeout_experiment (void *cls, const struct GNUNET_SCHEDULER_TaskContext* tc)
+{
+  struct Experiment *e = cls;
+  e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  fprintf (stderr, "Experiment timeout!\n");
+
+  e->e_done_cb (e, GNUNET_SYSERR);
+}
+
+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);
+
+  /* Scheduling next */
+  e->cur = e->cur->next;
+  if (NULL == e->cur)
+  {
+    /* done */
+    fprintf (stderr, "Last episode done!\n");
+    if (GNUNET_SCHEDULER_NO_TASK != e->experiment_timeout_task)
+    {
+      GNUNET_SCHEDULER_cancel (e->experiment_timeout_task);
+      e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+    }
+    e->e_done_cb (e, GNUNET_OK);
+    return;
+  }
+
+  fprintf (stderr, "Running episode %u with timeout %s\n",
+      e->cur->id,
+      GNUNET_STRINGS_relative_time_to_string(e->cur->duration, GNUNET_YES));
+  e->episode_timeout_task = GNUNET_SCHEDULER_add_delayed (e->cur->duration,
+      &timeout_episode, e);
+}
+
+
+void
+GNUNET_ATS_TEST_experimentation_run (struct Experiment *e,
+    GNUNET_ATS_TESTING_EpisodeDoneCallback ep_done_cb,
+    GNUNET_ATS_TESTING_ExperimentDoneCallback e_done_cb)
+{
+  fprintf (stderr, "Running experiment `%s'  with timeout %s\n", e->name,
+      GNUNET_STRINGS_relative_time_to_string(e->max_duration, GNUNET_YES));
+  e->e_done_cb = e_done_cb;
+  e->ep_done_cb = ep_done_cb;
+
+  /* Start total time out */
+  e->experiment_timeout_task = GNUNET_SCHEDULER_add_delayed (e->max_duration,
+      &timeout_experiment, e);
+
+  /* Start */
+  e->cur = e->start;
+  fprintf (stderr, "Running episode %u with timeout %s\n",
+      e->cur->id,
+      GNUNET_STRINGS_relative_time_to_string(e->cur->duration, GNUNET_YES));
+  e->episode_timeout_task = GNUNET_SCHEDULER_add_delayed (e->cur->duration,
+      &timeout_episode, e);
+
+
+}
+
 struct Experiment *
-GNUNET_ATS_TEST_experimentation_start (char *filename)
+GNUNET_ATS_TEST_experimentation_load (char *filename)
 {
   struct Experiment *e;
   struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -57,7 +178,7 @@ GNUNET_ATS_TEST_experimentation_start (char *filename)
   cfg = GNUNET_CONFIGURATION_create();
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, filename))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to load `%s'\n", filename);
+    fprintf (stderr, "Failed to load `%s'\n", filename);
     GNUNET_CONFIGURATION_destroy (cfg);
     return NULL;
   }
@@ -72,7 +193,7 @@ GNUNET_ATS_TEST_experimentation_start (char *filename)
     return NULL;
   }
   else
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Experiment name: `%s'\n", e->name);
+    fprintf (stderr, "Experiment name: `%s'\n", e->name);
 
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_filename (cfg, "experiment",
       "cfg_file", &e->cfg_file))
@@ -82,7 +203,7 @@ GNUNET_ATS_TEST_experimentation_start (char *filename)
     return NULL;
   }
   else
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Experiment name: `%s'\n", e->cfg_file);
+    fprintf (stderr, "Experiment name: `%s'\n", e->cfg_file);
 
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number(cfg, "experiment",
       "masters", &e->num_masters))
@@ -92,7 +213,7 @@ GNUNET_ATS_TEST_experimentation_start (char *filename)
     return NULL;
   }
   else
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Experiment masters: `%llu'\n",
+    fprintf (stderr, "Experiment masters: `%llu'\n",
         e->num_masters);
 
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number(cfg, "experiment",
@@ -103,7 +224,7 @@ GNUNET_ATS_TEST_experimentation_start (char *filename)
     return NULL;
   }
   else
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Experiment slaves: `%llu'\n",
+    fprintf (stderr, "Experiment slaves: `%llu'\n",
         e->num_slaves);
 
   if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time(cfg, "experiment",
@@ -114,15 +235,26 @@ GNUNET_ATS_TEST_experimentation_start (char *filename)
     return NULL;
   }
   else
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Experiment duration: `%s'\n",
+    fprintf (stderr, "Experiment duration: `%s'\n",
         GNUNET_STRINGS_relative_time_to_string (e->max_duration, GNUNET_YES));
 
+  load_episodes (e, cfg);
+  fprintf (stderr, "Loaded %u episodes with total duration %s\n",
+      e->num_episodes,
+      GNUNET_STRINGS_relative_time_to_string (e->total_duration, GNUNET_YES));
+
+  GNUNET_CONFIGURATION_destroy (cfg);
   return e;
 }
 
 void
 GNUNET_ATS_TEST_experimentation_stop (struct Experiment *e)
 {
+  if (GNUNET_SCHEDULER_NO_TASK != e->experiment_timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (e->experiment_timeout_task);
+    e->experiment_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  }
   free_experiment (e);
 }