moved eval tool to ats

3 files changed, 2481 insertions, 0 deletions

diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am
index 63a781abf..42401932c 100644
--- a/src/ats/Makefile.am
+++ b/src/ats/Makefile.am
@@ -17,6 +17,9 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
+noinst_PROGRAMS = \
+ gnunet-ats-solver-eval
+
 if HAVE_LIBGLPK
   GN_LIBGLPK = -lglpk
   GN_MLP_LIB = libgnunet_plugin_ats_mlp.la
@@ -37,6 +40,18 @@ plugin_LTLIBRARIES = \
   $(GN_MLP_LIB) \
   libgnunet_plugin_ats_ril.la
 
+gnunet_ats_solver_eval_SOURCES = \
+ gnunet-ats-solver-eval.c gnunet-service-ats_normalization.c 
+gnunet_ats_solver_eval_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(LTLIBINTL)
+gnunet_ats_solver_eval_DEPENDENCIES = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/ats/libgnunetats.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la
+
 libgnunetats_la_SOURCES = \
   ats_api_scheduling.c \
   ats_api_performance.c
diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c
new file mode 100644
index 000000000..adf7177ba
--- /dev/null
+++ b/src/ats/gnunet-ats-solver-eval.c
@@ -0,0 +1,1536 @@
+/*
+ This file is part of GNUnet.
+ (C) 2010-2013 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+/**
+ * @file ats-tests/ats-testing-experiment.c
+ * @brief ats benchmark: controlled experiment execution
+ * @author Christian Grothoff
+ * @author Matthias Wachs
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet-ats-solver-eval.h"
+
+
+#define BIG_M_STRING "unlimited"
+
+static struct Experiment *e;
+
+static struct GNUNET_ATS_TESTING_SolverHandle *sh;
+
+/**
+ * cmd option -e: experiment file
+ */
+static char *opt_exp_file;
+
+static char *opt_solver;
+
+/**
+ * cmd option -l: enable logging
+ */
+static int opt_log;
+
+/**
+ * cmd option -p: enable plots
+ */
+static int opt_plot;
+
+/**
+ * cmd option -v: verbose logs
+ */
+static int opt_verbose;
+
+static int res;
+
+static void
+end_now ();
+
+/**
+ * Experiments
+ */
+
+const char *
+print_op (enum OperationType op)
+{
+  switch (op) {
+    case SOLVER_OP_ADD_ADDRESS:
+      return "ADD_ADDRESS";
+    case SOLVER_OP_DEL_ADDRESS:
+      return "DEL_ADDRESS";
+    case SOLVER_OP_START_SET_PREFERENCE:
+      return "START_SET_PREFERENCE";
+    case SOLVER_OP_STOP_SET_PREFERENCE:
+      return "STOP_STOP_PREFERENCE";
+    case SOLVER_OP_START_SET_PROPERTY:
+          return "START_SET_PROPERTY";
+    case SOLVER_OP_STOP_SET_PROPERTY:
+      return "STOP_SET_PROPERTY";
+    default:
+      break;
+  }
+  return "";
+}
+
+
+static struct Experiment *
+create_experiment ()
+{
+  struct Experiment *e;
+  e = GNUNET_new (struct 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;
+  struct GNUNET_ATS_TEST_Operation *cur_o;
+  struct GNUNET_ATS_TEST_Operation *next_o;
+
+  next = e->start;
+  for (cur = next; NULL != cur; cur = next)
+  {
+    next = cur->next;
+
+    next_o = cur->head;
+    for (cur_o = next_o; NULL != cur_o; cur_o = next_o)
+    {
+      next_o = cur_o->next;
+      GNUNET_free (cur_o);
+    }
+    GNUNET_free (cur);
+  }
+
+  GNUNET_free_non_null (e->name);
+  GNUNET_free_non_null (e->cfg_file);
+  GNUNET_free (e);
+}
+
+
+static int
+load_op_add_address (struct GNUNET_ATS_TEST_Operation *o,
+    int op_counter,
+    char *sec_name,
+    const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  char *op_name;
+
+  /* peer id */
+  GNUNET_asprintf(&op_name, "op-%u-peer-id", op_counter);
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
+      sec_name, op_name, &o->peer_id))
+  {
+    fprintf (stderr, "Missing peer-id in operation %u `%s' in episode `%s'\n",
+        op_counter, "ADD_ADDRESS", op_name);
+    GNUNET_free (op_name);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (op_name);
+
+  /* address id */
+  GNUNET_asprintf(&op_name, "op-%u-address-id", op_counter);
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
+      sec_name, op_name, &o->address_id))
+  {
+    fprintf (stderr, "Missing address-id in operation %u `%s' in episode `%s'\n",
+        op_counter, "ADD_ADDRESS", op_name);
+    GNUNET_free (op_name);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (op_name);
+
+  /* plugin */
+  GNUNET_asprintf(&op_name, "op-%u-plugin", op_counter);
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (cfg,
+      sec_name, op_name, &o->plugin))
+  {
+    fprintf (stderr, "Missing plugin in operation %u `%s' in episode `%s'\n",
+        op_counter, "ADD_ADDRESS", op_name);
+    GNUNET_free (op_name);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (op_name);
+
+  /* address  */
+  GNUNET_asprintf(&op_name, "op-%u-address", op_counter);
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (cfg,
+      sec_name, op_name, &o->address))
+  {
+    fprintf (stderr, "Missing address in operation %u `%s' in episode `%s'\n",
+        op_counter, "ADD_ADDRESS", op_name);
+    GNUNET_free (op_name);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (op_name);
+
+  /* session */
+  GNUNET_asprintf(&op_name, "op-%u-address-session", op_counter);
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
+      sec_name, op_name, &o->address_session))
+  {
+    fprintf (stderr, "Missing address-session in operation %u `%s' in episode `%s'\n",
+        op_counter, "ADD_ADDRESS", op_name);
+    GNUNET_free (op_name);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (op_name);
+
+  /* network */
+  GNUNET_asprintf(&op_name, "op-%u-address-network", op_counter);
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
+      sec_name, op_name, &o->address_network))
+  {
+    fprintf (stderr, "Missing address-network in operation %u `%s' in episode `%s'\n",
+        op_counter, "ADD_ADDRESS", op_name);
+    GNUNET_free (op_name);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (op_name);
+
+  fprintf (stderr,
+      "Found operation %s: [%llu:%llu] address `%s' plugin `%s' \n",
+      "ADD_ADDRESS", o->peer_id, o->address_id, o->address, o->plugin);
+
+  return GNUNET_OK;
+}
+
+static int
+load_op_del_address (struct GNUNET_ATS_TEST_Operation *o,
+    int op_counter,
+    char *sec_name,
+    const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  char *op_name;
+
+  /* peer id */
+  GNUNET_asprintf(&op_name, "op-%u-peer-id", op_counter);
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
+      sec_name, op_name, &o->peer_id))
+  {
+    fprintf (stderr, "Missing peer-id in operation %u `%s' in episode `%s'\n",
+        op_counter, "DEL_ADDRESS", op_name);
+    GNUNET_free (op_name);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (op_name);
+
+  /* address id */
+  GNUNET_asprintf(&op_name, "op-%u-address-id", op_counter);
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
+      sec_name, op_name, &o->address_id))
+  {
+    fprintf (stderr, "Missing address-id in operation %u `%s' in episode `%s'\n",
+        op_counter, "DEL_ADDRESS", op_name);
+    GNUNET_free (op_name);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (op_name);
+
+  /* plugin */
+  GNUNET_asprintf(&op_name, "op-%u-plugin", op_counter);
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (cfg,
+      sec_name, op_name, &o->plugin))
+  {
+    fprintf (stderr, "Missing plugin in operation %u `%s' in episode `%s'\n",
+        op_counter, "DEL_ADDRESS", op_name);
+    GNUNET_free (op_name);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (op_name);
+
+  /* address  */
+  GNUNET_asprintf(&op_name, "op-%u-address", op_counter);
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (cfg,
+      sec_name, op_name, &o->address))
+  {
+    fprintf (stderr, "Missing address in operation %u `%s' in episode `%s'\n",
+        op_counter, "DEL_ADDRESS", op_name);
+    GNUNET_free (op_name);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (op_name);
+
+  /* session */
+  GNUNET_asprintf(&op_name, "op-%u-address-session", op_counter);
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
+      sec_name, op_name, &o->address_session))
+  {
+    fprintf (stderr, "Missing address-session in operation %u `%s' in episode `%s'\n",
+        op_counter, "DEL_ADDRESS", op_name);
+    GNUNET_free (op_name);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (op_name);
+
+  /* network */
+  GNUNET_asprintf(&op_name, "op-%u-address-network", op_counter);
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
+      sec_name, op_name, &o->address_network))
+  {
+    fprintf (stderr, "Missing address-network in operation %u `%s' in episode `%s'\n",
+        op_counter, "DEL_ADDRESS", op_name);
+    GNUNET_free (op_name);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_free (op_name);
+
+  fprintf (stderr,
+      "Found operation %s: [%llu:%llu] address `%s' plugin `%s' \n",
+      "DEL_ADDRESS", o->peer_id, o->address_id, o->address, o->plugin);
+
+  return GNUNET_OK;
+}
+
+static int
+load_episode (struct Experiment *e, struct Episode *cur,
+    struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  struct GNUNET_ATS_TEST_Operation *o;
+  char *sec_name;
+  char *op_name;
+  char *op;
+  char *type;
+  char *pref;
+  int op_counter = 0;
+  fprintf (stderr, "Parsing episode %u\n",cur->id);
+  GNUNET_asprintf(&sec_name, "episode-%u", cur->id);
+
+  while (1)
+  {
+    /* Load operation */
+    GNUNET_asprintf(&op_name, "op-%u-operation", op_counter);
+    if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string(cfg,
+        sec_name, op_name, &op))
+    {
+      GNUNET_free (op_name);
+      break;
+    }
+    o = GNUNET_new (struct GNUNET_ATS_TEST_Operation);
+    /* operations = set_rate, start_send, stop_send, set_preference */
+    if (0 == strcmp (op, "address_add"))
+    {
+      o->type = SOLVER_OP_ADD_ADDRESS;
+      if (GNUNET_SYSERR == load_op_add_address (o, op_counter, sec_name, cfg))
+      {
+        GNUNET_free (o);
+        GNUNET_free (op);
+        GNUNET_free (op_name);
+        return GNUNET_SYSERR;
+      }
+    }
+    else if (0 == strcmp (op, "address_del"))
+    {
+      o->type = SOLVER_OP_DEL_ADDRESS;
+      if (GNUNET_SYSERR == load_op_del_address (o, op_counter, sec_name, cfg))
+      {
+        GNUNET_free (o);
+        GNUNET_free (op);
+        GNUNET_free (op_name);
+        return GNUNET_SYSERR;
+      }
+    }
+    else if (0 == strcmp (op, "start_set_property"))
+    {
+      o->type = SOLVER_OP_START_SET_PROPERTY;
+    }
+    else if (0 == strcmp (op, "stop_set_property"))
+    {
+      o->type = SOLVER_OP_STOP_SET_PROPERTY;
+    }
+    else if (0 == strcmp (op, "start_set_preference"))
+    {
+      o->type = SOLVER_OP_START_SET_PREFERENCE;
+    }
+    else if (0 == strcmp (op, "stop_set_preference"))
+    {
+      o->type = SOLVER_OP_STOP_SET_PREFERENCE;
+    }
+    else
+    {
+      fprintf (stderr, "Invalid operation %u `%s' in episode %u\n",
+          op_counter, op, cur->id);
+      GNUNET_free (op);
+      GNUNET_free (op_name);
+      return GNUNET_SYSERR;
+    }
+    GNUNET_free (op);
+    GNUNET_free (op_name);
+
+    GNUNET_CONTAINER_DLL_insert (cur->head,cur->tail, o);
+    op_counter++;
+  }
+  GNUNET_free (sec_name);
+
+
+#if 0
+    /* Get source */
+    GNUNET_asprintf(&op_name, "op-%u-src", op_counter);
+    if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
+        sec_name, op_name, &o->src_id))
+    {
+      fprintf (stderr, "Missing src in operation %u `%s' in episode %u\n",
+          op_counter, op, cur->id);
+      GNUNET_free (op);
+      GNUNET_free (op_name);
+      return GNUNET_SYSERR;
+    }
+    if (o->src_id > (e->num_masters - 1))
+    {
+      fprintf (stderr, "Invalid src %llu in operation %u `%s' in episode %u\n",
+          o->src_id, op_counter, op, cur->id);
+      GNUNET_free (op);
+      GNUNET_free (op_name);
+      return GNUNET_SYSERR;
+    }
+    GNUNET_free (op_name);
+
+    /* Get destination */
+    GNUNET_asprintf(&op_name, "op-%u-dest", op_counter);
+    if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
+        sec_name, op_name, &o->dest_id))
+    {
+      fprintf (stderr, "Missing src in operation %u `%s' in episode %u\n",
+          op_counter, op, cur->id);
+      GNUNET_free (op);
+      GNUNET_free (op_name);
+      return GNUNET_SYSERR;
+    }
+    if (o->dest_id > (e->num_slaves - 1))
+    {
+      fprintf (stderr, "Invalid destination %llu in operation %u `%s' in episode %u\n",
+          o->dest_id, op_counter, op, cur->id);
+      GNUNET_free (op);
+      GNUNET_free (op_name);
+      return GNUNET_SYSERR;
+    }
+    GNUNET_free (op_name);
+
+    GNUNET_asprintf(&op_name, "op-%u-type", op_counter);
+    if ( (GNUNET_SYSERR != GNUNET_CONFIGURATION_get_value_string(cfg,
+            sec_name, op_name, &type)) &&
+        ((STOP_SEND != o->type) || (STOP_PREFERENCE != o->type)))
+    {
+      /* Load arguments for set_rate, start_send, set_preference */
+      if (0 == strcmp (type, "constant"))
+      {
+        o->tg_type = GNUNET_ATS_TEST_TG_CONSTANT;
+      }
+      else if (0 == strcmp (type, "linear"))
+      {
+        o->tg_type = GNUNET_ATS_TEST_TG_LINEAR;
+      }
+      else if (0 == strcmp (type, "sinus"))
+      {
+        o->tg_type = GNUNET_ATS_TEST_TG_SINUS;
+      }
+      else if (0 == strcmp (type, "random"))
+      {
+        o->tg_type = GNUNET_ATS_TEST_TG_RANDOM;
+      }
+      else
+      {
+        fprintf (stderr, "Invalid type %u `%s' in episode %u\n",
+            op_counter, op, cur->id);
+        GNUNET_free (type);
+        GNUNET_free (op);
+        GNUNET_free (op_name);
+        return GNUNET_SYSERR;
+      }
+      GNUNET_free (op_name);
+
+      /* Get base rate */
+      GNUNET_asprintf(&op_name, "op-%u-base-rate", op_counter);
+      if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
+          sec_name, op_name, &o->base_rate))
+      {
+        fprintf (stderr, "Missing base rate in operation %u `%s' in episode %u\n",
+            op_counter, op, cur->id);
+        GNUNET_free (type);
+        GNUNET_free (op);
+        GNUNET_free (op_name);
+        return GNUNET_SYSERR;
+      }
+      GNUNET_free (op_name);
+
+      /* Get max rate */
+      GNUNET_asprintf(&op_name, "op-%u-max-rate", op_counter);
+      if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number (cfg,
+          sec_name, op_name, &o->max_rate))
+      {
+        if ((GNUNET_ATS_TEST_TG_LINEAR == o->tg_type) ||
+            (GNUNET_ATS_TEST_TG_RANDOM == o->tg_type) ||
+            (GNUNET_ATS_TEST_TG_SINUS == o->tg_type))
+        {
+          fprintf (stderr, "Missing max rate in operation %u `%s' in episode %u\n",
+              op_counter, op, cur->id);
+          GNUNET_free (type);
+          GNUNET_free (op_name);
+          GNUNET_free (op);
+          return GNUNET_SYSERR;
+        }
+      }
+      GNUNET_free (op_name);
+
+      /* Get period */
+      GNUNET_asprintf(&op_name, "op-%u-period", op_counter);
+      if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time (cfg,
+          sec_name, op_name, &o->period))
+      {
+        o->period = cur->duration;
+      }
+      GNUNET_free (op_name);
+
+      if (START_PREFERENCE == o->type)
+      {
+          /* Get frequency */
+          GNUNET_asprintf(&op_name, "op-%u-frequency", op_counter);
+          if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time (cfg,
+              sec_name, op_name, &o->frequency))
+          {
+              fprintf (stderr, "Missing frequency in operation %u `%s' in episode %u\n",
+                  op_counter, op, cur->id);
+              GNUNET_free (type);
+              GNUNET_free (op_name);
+              GNUNET_free (op);
+              return GNUNET_SYSERR;
+          }
+          GNUNET_free (op_name);
+
+          /* Get preference */
+          GNUNET_asprintf(&op_name, "op-%u-pref", op_counter);
+          if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (cfg,
+              sec_name, op_name, &pref))
+          {
+              fprintf (stderr, "Missing preference in operation %u `%s' in episode %u\n",
+                  op_counter, op, cur->id);
+              GNUNET_free (type);
+              GNUNET_free (op_name);
+              GNUNET_free (op);
+              GNUNET_free_non_null (pref);
+              return GNUNET_SYSERR;
+          }
+
+          if (0 == strcmp(pref, "bandwidth"))
+            o->pref_type = GNUNET_ATS_PREFERENCE_BANDWIDTH;
+          else if (0 == strcmp(pref, "latency"))
+            o->pref_type = GNUNET_ATS_PREFERENCE_LATENCY;
+          else
+          {
+              fprintf (stderr, "Invalid preference in operation %u `%s' in episode %u\n",
+                  op_counter, op, cur->id);
+              GNUNET_free (type);
+              GNUNET_free (op_name);
+              GNUNET_free (op);
+              GNUNET_free (pref);
+              GNUNET_free_non_null (pref);
+              return GNUNET_SYSERR;
+          }
+          GNUNET_free (pref);
+          GNUNET_free (op_name);
+      }
+    }
+
+    /* Safety checks */
+    if ((GNUNET_ATS_TEST_TG_LINEAR == o->tg_type) ||
+        (GNUNET_ATS_TEST_TG_SINUS == o->tg_type))
+    {
+      if ((o->max_rate - o->base_rate) > o->base_rate)
+      {
+        /* This will cause an underflow */
+        GNUNET_break (0);
+      }
+      fprintf (stderr, "Selected max rate and base rate cannot be used for desired traffic form!\n");
+    }
+
+    if ((START_SEND == o->type) || (START_PREFERENCE == o->type))
+      fprintf (stderr, "Found operation %u in episode %u: %s [%llu]->[%llu] == %s, %llu -> %llu in %s\n",
+        op_counter, cur->id, print_op (o->type), o->src_id,
+        o->dest_id, (NULL != type) ? type : "",
+        o->base_rate, o->max_rate,
+        GNUNET_STRINGS_relative_time_to_string (o->period, GNUNET_YES));
+    else
+      fprintf (stderr, "Found operation %u in episode %u: %s [%llu]->[%llu]\n",
+        op_counter, cur->id, print_op (o->type), o->src_id, o->dest_id);
+
+    GNUNET_free_non_null (type);
+    GNUNET_free (op);
+#endif
+
+  return GNUNET_OK;
+}
+
+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;
+
+    if (GNUNET_OK != load_episode (e, cur, cfg))
+    {
+      GNUNET_free (sec_name);
+      GNUNET_free (cur);
+      return GNUNET_SYSERR;
+    }
+
+    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");
+
+  if (GNUNET_SCHEDULER_NO_TASK != e->episode_timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (e->episode_timeout_task);
+    e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+
+  e->e_done_cb (e, GNUNET_TIME_absolute_get_duration(e->start_time),
+      GNUNET_SYSERR);
+}
+
+static void
+enforce_add_address (struct GNUNET_ATS_TEST_Operation *op)
+{
+  /*
+  struct BenchmarkPeer *peer;
+  struct BenchmarkPartner *partner;
+
+  peer = GNUNET_ATS_TEST_get_peer (op->src_id);
+  if (NULL == peer)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  partner = GNUNET_ATS_TEST_get_partner (op->src_id, op->dest_id);
+  if (NULL == partner)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  fprintf (stderr, "Found master %llu slave %llu\n",op->src_id, op->dest_id);
+
+  if (NULL != partner->tg)
+  {
+    fprintf (stderr, "Stopping traffic between master %llu slave %llu\n",op->src_id, op->dest_id);
+    GNUNET_ATS_TEST_generate_traffic_stop(partner->tg);
+    partner->tg = NULL;
+  }
+
+  partner->tg = GNUNET_ATS_TEST_generate_traffic_start(peer, partner,
+      op->tg_type, op->base_rate, op->max_rate, op->period,
+      GNUNET_TIME_UNIT_FOREVER_REL);
+   */
+}
+
+static void
+enforce_del_address (struct GNUNET_ATS_TEST_Operation *op)
+{
+  /*
+  struct BenchmarkPartner *p;
+  p = GNUNET_ATS_TEST_get_partner (op->src_id, op->dest_id);
+  if (NULL == p)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  fprintf (stderr, "Found master %llu slave %llu\n",op->src_id, op->dest_id);
+
+  if (NULL != p->tg)
+  {
+    fprintf (stderr, "Stopping traffic between master %llu slave %llu\n",
+        op->src_id, op->dest_id);
+    GNUNET_ATS_TEST_generate_traffic_stop(p->tg);
+    p->tg = NULL;
+  }
+  */
+}
+
+static void
+enforce_start_property (struct GNUNET_ATS_TEST_Operation *op)
+{
+
+}
+
+static void
+enforce_stop_property (struct GNUNET_ATS_TEST_Operation *op)
+{
+
+}
+
+static void
+enforce_start_preference (struct GNUNET_ATS_TEST_Operation *op)
+{
+  /*
+  struct BenchmarkPeer *peer;
+  struct BenchmarkPartner *partner;
+
+  peer = GNUNET_ATS_TEST_get_peer (op->src_id);
+  if (NULL == peer)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  partner = GNUNET_ATS_TEST_get_partner (op->src_id, op->dest_id);
+  if (NULL == partner)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  fprintf (stderr, "Found master %llu slave %llu\n",op->src_id, op->dest_id);
+
+  if (NULL != partner->pg)
+  {
+    fprintf (stderr, "Stopping traffic between master %llu slave %llu\n",
+        op->src_id, op->dest_id);
+    GNUNET_ATS_TEST_generate_preferences_stop(partner->pg);
+    partner->pg = NULL;
+  }
+
+  partner->pg = GNUNET_ATS_TEST_generate_preferences_start(peer, partner,
+      op->tg_type, op->base_rate, op->max_rate, op->period, op->frequency,
+      op->pref_type);
+      */
+}
+
+static void
+enforce_stop_preference (struct GNUNET_ATS_TEST_Operation *op)
+{
+  /*
+  struct BenchmarkPartner *p;
+  p = GNUNET_ATS_TEST_get_partner (op->src_id, op->dest_id);
+  if (NULL == p)
+  {
+    GNUNET_break (0);
+    return;
+  }
+
+  fprintf (stderr, "Found master %llu slave %llu\n",op->src_id, op->dest_id);
+
+  if (NULL != p->pg)
+  {
+    fprintf (stderr, "Stopping preference between master %llu slave %llu\n",
+        op->src_id, op->dest_id);
+    GNUNET_ATS_TEST_generate_preferences_stop (p->pg);
+    p->pg = NULL;
+  }
+  */
+}
+
+static void enforce_episode (struct Episode *ep)
+{
+  struct GNUNET_ATS_TEST_Operation *cur;
+  for (cur = ep->head; NULL != cur; cur = cur->next)
+  {
+    switch (cur->type) {
+      case SOLVER_OP_ADD_ADDRESS:
+        fprintf (stderr, "Enforcing operation: %s [%llu:%llu]\n",
+            print_op (cur->type), cur->peer_id, cur->address_id);
+        enforce_add_address (cur);
+        break;
+      case SOLVER_OP_DEL_ADDRESS:
+        fprintf (stderr, "Enforcing operation: %s [%llu:%llu]\n",
+            print_op (cur->type), cur->peer_id, cur->address_id);
+        enforce_del_address (cur);
+        break;
+      case SOLVER_OP_START_SET_PROPERTY:
+        fprintf (stderr, "Enforcing operation: %s [%llu:%llu] == %llu\n",
+            print_op (cur->type), cur->peer_id, cur->address_id, cur->base_rate);
+        enforce_start_property (cur);
+        break;
+      case SOLVER_OP_STOP_SET_PROPERTY:
+        fprintf (stderr, "Enforcing operation: %s [%llu:%llu] == %llu\n",
+            print_op (cur->type), cur->peer_id, cur->address_id, cur->base_rate);
+        enforce_stop_property (cur);
+        break;
+      case SOLVER_OP_START_SET_PREFERENCE:
+        fprintf (stderr, "Enforcing operation: %s [%llu:%llu] == %llu\n",
+            print_op (cur->type), cur->peer_id, cur->address_id, cur->base_rate);
+        enforce_start_preference (cur);
+        break;
+      case SOLVER_OP_STOP_SET_PREFERENCE:
+        fprintf (stderr, "Enforcing operation: %s [%llu:%llu] == %llu\n",
+            print_op (cur->type), cur->peer_id, cur->address_id, cur->base_rate);
+        enforce_stop_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;
+  if (NULL != e->ep_done_cb)
+    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_TIME_absolute_get_duration(e->start_time), 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);
+  enforce_episode(e->cur);
+
+
+}
+
+
+void
+GNUNET_ATS_solvers_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;
+  e->start_time = GNUNET_TIME_absolute_get();
+
+  /* Start total time out */
+  e->experiment_timeout_task = GNUNET_SCHEDULER_add_delayed (e->max_duration,
+      &timeout_experiment, e);
+
+
+  /* Start */
+  if (NULL == e->start)
+  {
+    GNUNET_break (0);
+    return;
+  }
+  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);
+  enforce_episode(e->cur);
+
+}
+
+
+struct Experiment *
+GNUNET_ATS_solvers_experimentation_load (char *filename)
+{
+  struct Experiment *e;
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+  e = NULL;
+
+  cfg = GNUNET_CONFIGURATION_create();
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, filename))
+  {
+    fprintf (stderr, "Failed to load `%s'\n", filename);
+    GNUNET_CONFIGURATION_destroy (cfg);
+    return NULL;
+  }
+
+  e = create_experiment ();
+
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string(cfg, "experiment",
+      "name", &e->name))
+  {
+    fprintf (stderr, "Invalid %s", "name");
+    free_experiment (e);
+    return NULL;
+  }
+  else
+    fprintf (stderr, "Experiment name: `%s'\n", e->name);
+
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_filename (cfg, "experiment",
+      "cfg_file", &e->cfg_file))
+  {
+    fprintf (stderr, "Invalid %s", "cfg_file");
+    free_experiment (e);
+    return NULL;
+  }
+  else
+  {
+    fprintf (stderr, "Experiment name: `%s'\n", e->cfg_file);
+    e->cfg = GNUNET_CONFIGURATION_create();
+    if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (e->cfg, e->cfg_file))
+    {
+      fprintf (stderr, "Invalid configuration %s", "cfg_file");
+      free_experiment (e);
+      return NULL;
+    }
+
+  }
+
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number(cfg, "experiment",
+      "masters", &e->num_masters))
+  {
+    fprintf (stderr, "Invalid %s", "masters");
+    free_experiment (e);
+    return NULL;
+  }
+  else
+    fprintf (stderr, "Experiment masters: `%llu'\n",
+        e->num_masters);
+
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_number(cfg, "experiment",
+      "slaves", &e->num_slaves))
+  {
+    fprintf (stderr, "Invalid %s", "slaves");
+    free_experiment (e);
+    return NULL;
+  }
+  else
+    fprintf (stderr, "Experiment slaves: `%llu'\n",
+        e->num_slaves);
+
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time(cfg, "experiment",
+      "log_freq", &e->log_freq))
+  {
+    fprintf (stderr, "Invalid %s", "log_freq");
+    free_experiment (e);
+    return NULL;
+  }
+  else
+    fprintf (stderr, "Experiment logging frequency: `%s'\n",
+        GNUNET_STRINGS_relative_time_to_string (e->log_freq, GNUNET_YES));
+
+  if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_time(cfg, "experiment",
+      "max_duration", &e->max_duration))
+  {
+    fprintf (stderr, "Invalid %s", "max_duration");
+    free_experiment (e);
+    return NULL;
+  }
+  else
+    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_solvers_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;
+  }
+  if (GNUNET_SCHEDULER_NO_TASK != e->episode_timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (e->episode_timeout_task);
+    e->episode_timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+  if (NULL != e->cfg)
+  {
+    GNUNET_CONFIGURATION_destroy(e->cfg);
+    e->cfg = NULL;
+  }
+  free_experiment (e);
+}
+
+/**
+ * Logging
+ */
+
+
+/**
+ * Solver
+ */
+
+struct GNUNET_ATS_TESTING_SolverHandle
+{
+  char * plugin;
+  struct GNUNET_ATS_PluginEnvironment env;
+  void *solver;
+  struct GNUNET_CONTAINER_MultiPeerMap *addresses;
+};
+
+enum GNUNET_ATS_Solvers
+{
+  GNUNET_ATS_SOLVER_PROPORTIONAL,
+  GNUNET_ATS_SOLVER_MLP,
+  GNUNET_ATS_SOLVER_RIL,
+};
+
+void
+GNUNET_ATS_solvers_solver_stop (struct GNUNET_ATS_TESTING_SolverHandle *sh)
+{
+ GNUNET_PLUGIN_unload (sh->plugin, sh->solver);
+ GNUNET_CONTAINER_multipeermap_destroy(sh->addresses);
+ GNUNET_free (sh->plugin);
+ GNUNET_free (sh);
+}
+
+/**
+ * Load quotas for networks from configuration
+ *
+ * @param cfg configuration handle
+ * @param out_dest where to write outbound quotas
+ * @param in_dest where to write inbound quotas
+ * @param dest_length length of inbound and outbound arrays
+ * @return number of networks loaded
+ */
+unsigned int
+GNUNET_ATS_solvers_load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                                 unsigned long long *out_dest,
+                                                 unsigned long long *in_dest,
+                                                 int dest_length)
+{
+  char *network_str[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkTypeString;
+  char * entry_in = NULL;
+  char * entry_out = NULL;
+  char * quota_out_str;
+  char * quota_in_str;
+  int c;
+  int res;
+
+  for (c = 0; (c < GNUNET_ATS_NetworkTypeCount) && (c < dest_length); c++)
+  {
+    in_dest[c] = 0;
+    out_dest[c] = 0;
+    GNUNET_asprintf (&entry_out, "%s_QUOTA_OUT", network_str[c]);
+    GNUNET_asprintf (&entry_in, "%s_QUOTA_IN", network_str[c]);
+
+    /* quota out */
+    if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(cfg, "ats", entry_out, &quota_out_str))
+    {
+      res = GNUNET_NO;
+      if (0 == strcmp(quota_out_str, BIG_M_STRING))
+      {
+        out_dest[c] = GNUNET_ATS_MaxBandwidth;
+        res = GNUNET_YES;
+      }
+      if ((GNUNET_NO == res) && (GNUNET_OK == GNUNET_STRINGS_fancy_size_to_bytes (quota_out_str, &out_dest[c])))
+        res = GNUNET_YES;
+      if ((GNUNET_NO == res) && (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cfg, "ats", entry_out,  &out_dest[c])))
+         res = GNUNET_YES;
+
+      if (GNUNET_NO == res)
+      {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Could not load quota for network `%s':  `%s', assigning default bandwidth %llu\n"),
+              network_str[c], quota_out_str, GNUNET_ATS_DefaultBandwidth);
+          out_dest[c] = GNUNET_ATS_DefaultBandwidth;
+      }
+      else
+      {
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Outbound quota configure for network `%s' is %llu\n"),
+              network_str[c], out_dest[c]);
+      }
+      GNUNET_free (quota_out_str);
+    }
+    else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("No outbound quota configured for network `%s', assigning default bandwidth %llu\n"),
+          network_str[c], GNUNET_ATS_DefaultBandwidth);
+      out_dest[c] = GNUNET_ATS_DefaultBandwidth;
+    }
+
+    /* quota in */
+    if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(cfg, "ats", entry_in, &quota_in_str))
+    {
+      res = GNUNET_NO;
+      if (0 == strcmp(quota_in_str, BIG_M_STRING))
+      {
+        in_dest[c] = GNUNET_ATS_MaxBandwidth;
+        res = GNUNET_YES;
+      }
+      if ((GNUNET_NO == res) && (GNUNET_OK == GNUNET_STRINGS_fancy_size_to_bytes (quota_in_str, &in_dest[c])))
+        res = GNUNET_YES;
+      if ((GNUNET_NO == res) && (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (cfg, "ats", entry_in,  &in_dest[c])))
+         res = GNUNET_YES;
+
+      if (GNUNET_NO == res)
+      {
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Could not load quota for network `%s':  `%s', assigning default bandwidth %llu\n"),
+              network_str[c], quota_in_str, GNUNET_ATS_DefaultBandwidth);
+          in_dest[c] = GNUNET_ATS_DefaultBandwidth;
+      }
+      else
+      {
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Inbound quota configured for network `%s' is %llu\n"),
+              network_str[c], in_dest[c]);
+      }
+      GNUNET_free (quota_in_str);
+    }
+    else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _("No outbound quota configure for network `%s', assigning default bandwidth %llu\n"),
+          network_str[c], GNUNET_ATS_DefaultBandwidth);
+      out_dest[c] = GNUNET_ATS_DefaultBandwidth;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Loaded quota for network `%s' (in/out): %llu %llu\n", network_str[c], in_dest[c], out_dest[c]);
+    GNUNET_free (entry_out);
+    GNUNET_free (entry_in);
+  }
+  return GNUNET_ATS_NetworkTypeCount;
+}
+
+/**
+ * Information callback for the solver
+ *
+ * @param op the solver operation
+ * @param stat status of the solver operation
+ * @param add additional solver information
+ */
+static void
+solver_info_cb (void *cls,
+    enum GAS_Solver_Operation op,
+    enum GAS_Solver_Status stat,
+    enum GAS_Solver_Additional_Information add)
+{
+  char *add_info;
+  switch (add) {
+    case GAS_INFO_NONE:
+      add_info = "GAS_INFO_NONE";
+      break;
+    case GAS_INFO_FULL:
+      add_info = "GAS_INFO_MLP_FULL";
+      break;
+    case GAS_INFO_UPDATED:
+      add_info = "GAS_INFO_MLP_UPDATED";
+      break;
+    case GAS_INFO_PROP_ALL:
+      add_info = "GAS_INFO_PROP_ALL";
+      break;
+    case GAS_INFO_PROP_SINGLE:
+      add_info = "GAS_INFO_PROP_SINGLE";
+      break;
+    default:
+      add_info = "INVALID";
+      break;
+  }
+
+  switch (op)
+  {
+    case GAS_OP_SOLVE_START:
+      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+          "Solver notifies `%s' with result `%s' `%s'\n", "GAS_OP_SOLVE_START",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL", add_info);
+      return;
+    case GAS_OP_SOLVE_STOP:
+      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_STOP",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL", add_info);
+      return;
+
+    case GAS_OP_SOLVE_SETUP_START:
+      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_SETUP_START",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+
+    case GAS_OP_SOLVE_SETUP_STOP:
+      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_SETUP_STOP",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+
+    case GAS_OP_SOLVE_MLP_LP_START:
+      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_LP_START",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+    case GAS_OP_SOLVE_MLP_LP_STOP:
+      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_LP_STOP",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+
+    case GAS_OP_SOLVE_MLP_MLP_START:
+      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_MLP_START",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+    case GAS_OP_SOLVE_MLP_MLP_STOP:
+      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_MLP_STOP",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+    case GAS_OP_SOLVE_UPDATE_NOTIFICATION_START:
+      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_UPDATE_NOTIFICATION_START",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+    case GAS_OP_SOLVE_UPDATE_NOTIFICATION_STOP:
+      GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_UPDATE_NOTIFICATION_STOP",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+    default:
+      break;
+    }
+}
+
+static void
+solver_bandwidth_changed_cb (void *cls, struct ATS_Address *address)
+{
+  if ( (0 == ntohl (address->assigned_bw_out.value__)) &&
+       (0 == ntohl (address->assigned_bw_in.value__)) )
+    return;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Bandwidth changed addresses %s %p to %u Bps out / %u Bps in\n",
+              GNUNET_i2s (&address->peer),
+              address,
+              (unsigned int) ntohl (address->assigned_bw_out.value__),
+              (unsigned int) ntohl (address->assigned_bw_in.value__));
+  /*if (GNUNET_YES == ph.bulk_running)
+    GNUNET_break (0);*/
+  return;
+}
+
+const double *
+get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
+{
+  return GAS_normalization_get_preferences_by_peer (id);
+}
+
+
+const double *
+get_property_cb (void *cls, const struct ATS_Address *address)
+{
+  return GAS_normalization_get_properties ((struct ATS_Address *) address);
+}
+
+static void
+normalized_property_changed_cb (void *cls, struct ATS_Address *peer,
+    uint32_t type, double prop_rel)
+{
+  /* TODO */
+}
+
+
+struct GNUNET_ATS_TESTING_SolverHandle *
+GNUNET_ATS_solvers_solver_start (enum GNUNET_ATS_Solvers type)
+{
+  struct GNUNET_ATS_TESTING_SolverHandle *sh;
+  char * solver_str;
+  unsigned long long quotas_in[GNUNET_ATS_NetworkTypeCount];
+  unsigned long long quotas_out[GNUNET_ATS_NetworkTypeCount];
+
+  switch (type) {
+    case GNUNET_ATS_SOLVER_PROPORTIONAL:
+      solver_str = "proportional";
+      break;
+    case GNUNET_ATS_SOLVER_MLP:
+      solver_str = "mlp";
+      break;
+    case GNUNET_ATS_SOLVER_RIL:
+      solver_str = "ril";
+      break;
+    default:
+      GNUNET_break (0);
+      return NULL;
+      break;
+  }
+
+  sh = GNUNET_new (struct GNUNET_ATS_TESTING_SolverHandle);
+  GNUNET_asprintf (&sh->plugin, "libgnunet_plugin_ats_%s", solver_str);
+
+  /* setup environment */
+  sh->env.cfg = e->cfg;
+  sh->env.stats = GNUNET_STATISTICS_create ("ats", e->cfg);
+  sh->env.addresses = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
+  sh->env.bandwidth_changed_cb = &solver_bandwidth_changed_cb;
+  sh->env.get_preferences = &get_preferences_cb;
+  sh->env.get_property = &get_property_cb;
+  sh->env.network_count = GNUNET_ATS_NetworkTypeCount;
+  sh->env.info_cb = &solver_info_cb;
+  sh->env.info_cb_cls = NULL;
+
+  /* start normalization */
+  GAS_normalization_start (NULL, NULL, &normalized_property_changed_cb, NULL );
+
+  /* load quotas */
+  if (GNUNET_ATS_NetworkTypeCount != GNUNET_ATS_solvers_load_quotas (e->cfg,
+      quotas_out, quotas_in, GNUNET_ATS_NetworkTypeCount))
+  {
+    GNUNET_break(0);
+    GNUNET_free (sh->plugin);
+    GNUNET_free (sh);
+    end_now ();
+    return NULL;
+  }
+
+  sh->solver = GNUNET_PLUGIN_load (sh->plugin, &sh->env);
+  if (NULL == sh->solver)
+  {
+    fprintf (stderr, "Failed to load solver `%s'\n", sh->plugin);
+    GNUNET_break(0);
+    GNUNET_free (sh->plugin);
+    GNUNET_free (sh);
+    end_now ();
+    return NULL;
+  }
+
+  sh->addresses = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
+
+  return sh;
+}
+
+static void
+done ()
+{
+  /* Clean up experiment */
+  GNUNET_ATS_solvers_experimentation_stop (e);
+  e = NULL;
+
+  /* Shutdown */
+  end_now();
+
+}
+
+static void
+experiment_done_cb (struct Experiment *e, struct GNUNET_TIME_Relative duration,int success)
+{
+  if (GNUNET_OK == success)
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Experiment done successful in %s\n",
+        GNUNET_STRINGS_relative_time_to_string (duration, GNUNET_YES));
+  else
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Experiment failed \n");
+
+  /* Stop logging */
+  // GNUNET_ATS_TEST_logging_stop (l);
+
+  /* Stop traffic generation */
+  // GNUNET_ATS_TEST_generate_traffic_stop_all();
+
+  /* Stop all preference generations */
+  // GNUNET_ATS_TEST_generate_preferences_stop_all ();
+
+  /*
+  evaluate (duration);
+  if (opt_log)
+    GNUNET_ATS_TEST_logging_write_to_file(l, opt_exp_file, opt_plot);
+
+  if (NULL != l)
+  {
+    GNUNET_ATS_TEST_logging_stop (l);
+    GNUNET_ATS_TEST_logging_clean_up (l);
+    l = NULL;
+  }
+  */
+  GNUNET_SCHEDULER_add_now (&done, NULL);
+}
+
+static void
+episode_done_cb (struct Episode *ep)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Episode %u done\n", ep->id);
+}
+
+
+
+/**
+ * Do shutdown
+ */
+static void
+end_now ()
+{
+  if (NULL != e)
+  {
+    GNUNET_ATS_solvers_experimentation_stop (e);
+    e = NULL;
+  }
+  if (NULL != sh)
+  {
+    GNUNET_ATS_solvers_solver_stop (sh);
+    sh = NULL;
+  }
+}
+
+static void
+run (void *cls, char * const *args, const char *cfgfile,
+    const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  enum GNUNET_ATS_Solvers solver;
+
+  if (NULL == opt_exp_file)
+  {
+    fprintf (stderr, "No experiment given ...\n");
+    res = 1;
+    end_now ();
+    return;
+  }
+
+  if (NULL == opt_solver)
+  {
+    fprintf (stderr, "No solver given ...\n");
+    res = 1;
+    end_now ();
+    return;
+  }
+
+  if (0 == strcmp(opt_solver, "mlp"))
+  {
+    solver = GNUNET_ATS_SOLVER_MLP;
+  }
+  else if (0 == strcmp(opt_solver, "proportional"))
+  {
+    solver = GNUNET_ATS_SOLVER_PROPORTIONAL;
+  }
+  else if (0 == strcmp(opt_solver, "ril"))
+  {
+    solver = GNUNET_ATS_SOLVER_RIL;
+  }
+  else
+  {
+    fprintf (stderr, "No solver given ...");
+    res = 1;
+    end_now ();
+    return;
+  }
+
+  /* load experiment */
+  e = GNUNET_ATS_solvers_experimentation_load (opt_exp_file);
+  if (NULL == e)
+  {
+    fprintf (stderr, "Failed to load experiment ...\n");
+    res = 1;
+    end_now ();
+    return;
+  }
+
+
+  /* load solver */
+  sh = GNUNET_ATS_solvers_solver_start (solver);
+  if (NULL == sh)
+  {
+    fprintf (stderr, "Failed to start solver ...\n");
+    end_now ();
+    res = 1;
+    return;
+  }
+
+  /* start logging */
+
+
+  /* run experiment */
+  GNUNET_ATS_solvers_experimentation_run (e, episode_done_cb,
+      experiment_done_cb);
+
+  /* WAIT */
+}
+
+
+/**
+ * Main function of the benchmark
+ *
+ * @param argc argument count
+ * @param argv argument values
+ */
+int
+main (int argc, char *argv[])
+{
+  opt_exp_file = NULL;
+  opt_solver = NULL;
+  opt_log = GNUNET_NO;
+  opt_plot = GNUNET_NO;
+
+  res = 0;
+
+  static struct GNUNET_GETOPT_CommandLineOption options[] =
+  {
+    { 's', "solver", NULL,
+        gettext_noop ("solver to use"),
+        1, &GNUNET_GETOPT_set_string, &opt_solver},
+    {  'e', "experiment", NULL,
+      gettext_noop ("experiment to use"),
+      1, &GNUNET_GETOPT_set_string, &opt_exp_file},
+    {  'e', "experiment", NULL,
+      gettext_noop ("experiment to use"),
+      1, &GNUNET_GETOPT_set_one, &opt_verbose},
+    GNUNET_GETOPT_OPTION_END
+  };
+
+  GNUNET_PROGRAM_run (argc, argv, argv[0], NULL, options, &run, argv[0]);
+
+  return res;
+}
+/* end of file ats-testing-experiment.c*/
+
diff --git a/src/ats/gnunet-ats-solver-eval.h b/src/ats/gnunet-ats-solver-eval.h
new file mode 100644
index 000000000..0b30fead7
--- /dev/null
+++ b/src/ats/gnunet-ats-solver-eval.h
@@ -0,0 +1,930 @@
+/*
+ This file is part of GNUnet.
+ (C) 2010-2013 Christian Grothoff (and other contributing authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING.  If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+ */
+/**
+ * @file ats-tests/ats-testing-experiment.c
+ * @brief ats benchmark: controlled experiment execution
+ * @author Christian Grothoff
+ * @author Matthias Wachs
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_ats_plugin.h"
+#include "gnunet_ats_service.h"
+#include "gnunet-service-ats_addresses.h"
+#include "gnunet-service-ats_normalization.h"
+#include "test_ats_api_common.h"
+
+enum GeneratorType
+{
+  GNUNET_ATS_TEST_TG_LINEAR,
+  GNUNET_ATS_TEST_TG_CONSTANT,
+  GNUNET_ATS_TEST_TG_RANDOM,
+  GNUNET_ATS_TEST_TG_SINUS
+};
+
+
+enum OperationType
+{
+  SOLVER_OP_ADD_ADDRESS,
+  SOLVER_OP_DEL_ADDRESS,
+  SOLVER_OP_START_SET_PROPERTY,
+  SOLVER_OP_STOP_SET_PROPERTY,
+  SOLVER_OP_START_SET_PREFERENCE,
+  SOLVER_OP_STOP_SET_PREFERENCE
+};
+
+struct Episode;
+
+struct Experiment;
+
+typedef void (*GNUNET_ATS_TESTING_EpisodeDoneCallback) (
+    struct Episode *e);
+
+typedef void (*GNUNET_ATS_TESTING_ExperimentDoneCallback) (struct Experiment *e,
+    struct GNUNET_TIME_Relative duration,int success);
+
+/**
+ * An operation in an experiment
+ */
+struct GNUNET_ATS_TEST_Operation
+{
+  struct GNUNET_ATS_TEST_Operation *next;
+  struct GNUNET_ATS_TEST_Operation *prev;
+
+  long long unsigned int address_id;
+  long long unsigned int peer_id;
+  long long unsigned int address_session;
+  long long unsigned int address_network;
+  char*address;
+  char*plugin;
+
+  long long unsigned int base_rate;
+  long long unsigned int max_rate;
+  struct GNUNET_TIME_Relative period;
+  struct GNUNET_TIME_Relative frequency;
+
+  enum OperationType type;
+  enum GeneratorType tg_type;
+  enum GNUNET_ATS_PreferenceKind pref_type;
+};
+
+struct Episode
+{
+  int id;
+  struct Episode *next;
+  struct GNUNET_TIME_Relative duration;
+
+  struct GNUNET_ATS_TEST_Operation *head;
+  struct GNUNET_ATS_TEST_Operation *tail;
+};
+
+
+struct Experiment
+{
+  char *name;
+  char *cfg_file;
+  unsigned long long int num_masters;
+  unsigned long long int num_slaves;
+  struct GNUNET_TIME_Relative log_freq;
+  struct GNUNET_TIME_Relative max_duration;
+  struct GNUNET_TIME_Relative total_duration;
+  struct GNUNET_TIME_Absolute start_time;
+  unsigned int num_episodes;
+  struct Episode *start;
+
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  GNUNET_SCHEDULER_TaskIdentifier experiment_timeout_task;
+  GNUNET_SCHEDULER_TaskIdentifier episode_timeout_task;
+  struct Episode *cur;
+
+  GNUNET_ATS_TESTING_EpisodeDoneCallback ep_done_cb;
+  GNUNET_ATS_TESTING_ExperimentDoneCallback e_done_cb;
+};
+
+
+/**
+ * A single logging time step for a partner
+ */
+struct PartnerLoggingTimestep
+{
+  /**
+   * Peer
+   */
+  struct BenchmarkPeer *slave;
+
+  /**
+   * Total number of messages this peer has sent
+   */
+  unsigned int total_messages_sent;
+
+  /**
+   * Total number of bytes this peer has sent
+   */
+  unsigned int total_bytes_sent;
+
+  /**
+   * Total number of messages this peer has received
+   */
+  unsigned int total_messages_received;
+
+  /**
+   * Total number of bytes this peer has received
+   */
+  unsigned int total_bytes_received;
+
+  /**
+   * Total outbound throughput for master in Bytes / s
+   */
+  unsigned int throughput_sent;
+
+  /**
+   * Total inbound throughput for master in Bytes / s
+   */
+  unsigned int throughput_recv;
+
+  /**
+   * Accumulated RTT for all messages
+   */
+  unsigned int total_app_rtt;
+
+  /**
+   * Current application level delay
+   */
+  unsigned int app_rtt;
+
+  /* Current ATS properties */
+
+  uint32_t ats_distance;
+
+  uint32_t ats_delay;
+
+  uint32_t bandwidth_in;
+
+  uint32_t bandwidth_out;
+
+  uint32_t ats_utilization_up;
+
+  uint32_t ats_utilization_down;
+
+  uint32_t ats_network_type;
+
+  uint32_t ats_cost_wan;
+
+  uint32_t ats_cost_lan;
+
+  uint32_t ats_cost_wlan;
+
+  double pref_bandwidth;
+  double pref_delay;
+};
+
+
+/**
+ * A single logging time step for a peer
+ */
+struct PeerLoggingTimestep
+{
+  /**
+   * Next in DLL
+   */
+  struct PeerLoggingTimestep *next;
+
+  /**
+   * Prev in DLL
+   */
+  struct PeerLoggingTimestep *prev;
+
+  /**
+   * Logging timestamp
+   */
+  struct GNUNET_TIME_Absolute timestamp;
+
+  /**
+   * Total number of messages this peer has sent
+   */
+  unsigned int total_messages_sent;
+
+  /**
+   * Total number of bytes this peer has sent
+   */
+  unsigned int total_bytes_sent;
+
+  /**
+   * Total number of messages this peer has received
+   */
+  unsigned int total_messages_received;
+
+  /**
+   * Total number of bytes this peer has received
+   */
+  unsigned int total_bytes_received;
+
+  /**
+   * Total outbound throughput for master in Bytes / s
+   */
+  unsigned int total_throughput_send;
+
+  /**
+   * Total inbound throughput for master in Bytes / s
+   */
+  unsigned int total_throughput_recv;
+
+  /**
+   * Logs for slaves
+   */
+  struct PartnerLoggingTimestep *slaves_log;
+};
+
+/**
+ * Entry for a benchmark peer
+ */
+struct LoggingPeer
+{
+  /**
+   * Peer
+   */
+  struct BenchmarkPeer *peer;
+
+  /**
+   * Start time
+   */
+  struct GNUNET_TIME_Absolute start;
+
+  /**
+   * DLL for logging entries: head
+   */
+  struct PeerLoggingTimestep *head;
+
+  /**
+   * DLL for logging entries: tail
+   */
+  struct PeerLoggingTimestep *tail;
+};
+
+
+struct LoggingHandle
+{
+  /**
+   * Logging task
+   */
+  GNUNET_SCHEDULER_TaskIdentifier log_task;
+
+  /**
+   * Reference to perf_ats' masters
+   */
+  int num_masters;
+  int num_slaves;
+  int running;
+  int verbose;
+  char *name;
+  struct GNUNET_TIME_Relative frequency;
+
+  /**
+   * Log structure of length num_peers
+   */
+  struct LoggingPeer *lp;
+};
+
+
+/**
+ * Start logging
+ *
+ * @param log_frequency the logging frequency
+ * @param testname the testname
+ * @param masters the master peers used for benchmarking
+ * @param num_master the number of master peers
+ * @return the logging handle or NULL on error
+ */
+struct LoggingHandle *
+GNUNET_ATS_TEST_logging_start(struct GNUNET_TIME_Relative log_frequency,
+    char *testname, struct BenchmarkPeer *masters, int num_masters, int num_slaves,
+    int verbose);
+
+/**
+ * Stop logging
+ *
+ * @param l the logging handle
+ */
+void
+GNUNET_ATS_TEST_logging_clean_up (struct LoggingHandle *l);
+
+/**
+ * Stop logging
+ *
+ * @param l the logging handle
+ */
+void
+GNUNET_ATS_TEST_logging_stop (struct LoggingHandle *l);
+
+/**
+ * Log all data now
+ *
+ * @param l logging handle to use
+ */
+void
+GNUNET_ATS_TEST_logging_now (struct LoggingHandle *l);
+
+
+/**
+ * Write logging data to file
+ *
+ * @param l logging handle to use
+ * @param test_name name of the current test
+ * @param plots create gnuplots: GNUNET_YES or GNUNET_NO
+ */
+void
+GNUNET_ATS_TEST_logging_write_to_file (struct LoggingHandle *l,
+    char *test_name, int plots);
+
+
+
+
+
+
+/* LEGACY */
+
+#if 0
+#define TEST_ATS_PREFERENCE_DEFAULT 1.0
+
+/**
+ * Message type sent for traffic generation
+ */
+#define TEST_MESSAGE_TYPE_PING 12345
+
+/**
+ * Message type sent as response during traffic generation
+ */
+#define TEST_MESSAGE_TYPE_PONG 12346
+
+/**
+ * Size of test messages
+ */
+#define TEST_MESSAGE_SIZE 100
+
+struct BenchmarkPartner;
+
+struct BenchmarkPeer;
+
+struct GNUNET_ATS_TEST_Topology;
+
+struct TrafficGenerator;
+
+
+
+
+
+/**
+ * Callback to call when topology setup is completed
+ *
+ * @param cls the closure
+ * @param masters array of master peers
+ * @param slaves array of master peers
+ */
+typedef void (*GNUNET_ATS_TEST_TopologySetupDoneCallback) (void *cls,
+    struct BenchmarkPeer *masters,
+    struct BenchmarkPeer *slaves);
+
+/**
+ * Callback called when logging is required for the data contained
+ *
+ * @param cls the closure
+ * @param address an address
+ * @param address_active is address active
+ * @param bandwidth_out bandwidth outbound
+ * @param bandwidth_in bandwidth inbound
+ * @param ats ats information
+ * @param ats_count number of ats inforation
+ */
+typedef void
+(*GNUNET_ATS_TEST_LogRequest) (void *cls,
+    const struct GNUNET_HELLO_Address *address,
+    int address_active,
+    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+    const struct GNUNET_ATS_Information *ats,
+    uint32_t ats_count);
+
+/**
+ * Information we track for a peer in the testbed.
+ */
+struct BenchmarkPeer
+{
+  /**
+   * Handle with testbed.
+   */
+  struct GNUNET_TESTBED_Peer *peer;
+
+  /**
+   * Unique identifier
+   */
+  int no;
+
+  /**
+   * Is this peer a measter: GNUNET_YES/GNUNET_NO
+   */
+  int master;
+
+  /**
+   *  Peer ID
+   */
+  struct GNUNET_PeerIdentity id;
+
+  /**
+   * Testbed operation to get peer information
+   */
+  struct GNUNET_TESTBED_Operation *peer_id_op;
+
+  /**
+   * Testbed operation to connect to ATS performance service
+   */
+  struct GNUNET_TESTBED_Operation *ats_perf_op;
+
+  /**
+   * Testbed operation to connect to core
+   */
+  struct GNUNET_TESTBED_Operation *comm_op;
+
+  /**
+   * ATS performance handle
+   */
+  struct GNUNET_ATS_PerformanceHandle *ats_perf_handle;
+
+  /**
+   * Masters only:
+   * Testbed connect operations to connect masters to slaves
+   */
+  struct TestbedConnectOperation *core_connect_ops;
+
+  /**
+   *  Core handle
+   */
+  struct GNUNET_CORE_Handle *ch;
+
+  /**
+   *  Core handle
+   */
+  struct GNUNET_TRANSPORT_Handle *th;
+
+  /**
+   * Masters only:
+   * Peer to set ATS preferences for
+   */
+  struct BenchmarkPeer *pref_partner;
+
+  /**
+   * Masters only
+   * Progress task
+   */
+  GNUNET_SCHEDULER_TaskIdentifier ats_task;
+
+  /**
+   * Masters only
+   * Progress task
+   */
+  double pref_value;
+
+  /**
+   * Array of partners with num_slaves entries (if master) or
+   * num_master entries (if slave)
+   */
+  struct BenchmarkPartner *partners;
+
+  /**
+   * Number of partners
+   */
+  int num_partners;
+
+  /**
+   * Number of core connections
+   */
+  int core_connections;
+
+  /**
+   * Masters only:
+   * Number of connections to slave peers
+   */
+  int core_slave_connections;
+
+  /**
+   * Total number of messages this peer has sent
+   */
+  unsigned int total_messages_sent;
+
+  /**
+   * Total number of bytes this peer has sent
+   */
+  unsigned int total_bytes_sent;
+
+  /**
+   * Total number of messages this peer has received
+   */
+  unsigned int total_messages_received;
+
+  /**
+   * Total number of bytes this peer has received
+   */
+  unsigned int total_bytes_received;
+};
+
+struct TrafficGenerator
+{
+  struct TrafficGenerator *prev;
+  struct TrafficGenerator *next;
+
+  enum GeneratorType type;
+
+  struct BenchmarkPeer *src;
+  struct BenchmarkPartner *dest;
+
+  long int base_rate;
+  long int max_rate;
+  struct GNUNET_TIME_Relative duration_period;
+
+  GNUNET_SCHEDULER_TaskIdentifier send_task;
+  struct GNUNET_TIME_Absolute next_ping_transmission;
+  struct GNUNET_TIME_Absolute time_start;
+};
+
+
+struct PreferenceGenerator
+{
+  struct PreferenceGenerator *prev;
+  struct PreferenceGenerator *next;
+
+  enum GeneratorType type;
+
+  struct BenchmarkPeer *src;
+  struct BenchmarkPartner *dest;
+
+  enum GNUNET_ATS_PreferenceKind kind;
+
+  long int base_value;
+  long int max_value;
+  struct GNUNET_TIME_Relative duration_period;
+  struct GNUNET_TIME_Relative frequency;
+
+  GNUNET_SCHEDULER_TaskIdentifier set_task;
+  struct GNUNET_TIME_Absolute next_ping_transmission;
+  struct GNUNET_TIME_Absolute time_start;
+};
+
+/**
+ * Information about a benchmarking partner
+ */
+struct BenchmarkPartner
+{
+  /**
+   * The peer itself this partner belongs to
+   */
+  struct BenchmarkPeer *me;
+
+  /**
+   * The partner peer
+   */
+  struct BenchmarkPeer *dest;
+
+  /**
+   * Core transmit handles
+   */
+  struct GNUNET_CORE_TransmitHandle *cth;
+
+  /**
+   * Transport transmit handles
+   */
+  struct GNUNET_TRANSPORT_TransmitHandle *tth;
+
+  struct TrafficGenerator *tg;
+  struct PreferenceGenerator *pg;
+
+  /**
+   * Timestamp to calculate communication layer delay
+   */
+  struct GNUNET_TIME_Absolute last_message_sent;
+
+  /**
+   * Accumulated RTT for all messages
+   */
+  unsigned int total_app_rtt;
+
+  /**
+   * Number of messages sent to this partner
+   */
+  unsigned int messages_sent;
+
+  /**
+   * Number of bytes sent to this partner
+   */
+  unsigned int bytes_sent;
+
+  /**
+   * Number of messages received from this partner
+   */
+  unsigned int messages_received;
+
+  /**
+   * Number of bytes received from this partner
+   */
+  unsigned int bytes_received;
+
+  /* Current ATS properties */
+
+  uint32_t ats_distance;
+
+  uint32_t ats_delay;
+
+  uint32_t bandwidth_in;
+
+  uint32_t bandwidth_out;
+
+  uint32_t ats_utilization_up;
+
+  uint32_t ats_utilization_down;
+
+  uint32_t ats_network_type;
+
+  uint32_t ats_cost_wan;
+
+  uint32_t ats_cost_lan;
+
+  uint32_t ats_cost_wlan;
+
+  double pref_bandwidth;
+  double pref_delay;
+};
+
+/**
+ * Overall state of the performance benchmark
+ */
+struct BenchmarkState
+{
+  /**
+   * Are we connected to ATS service of all peers: GNUNET_YES/NO
+   */
+  int connected_ATS_service;
+
+  /**
+   * Are we connected to CORE service of all peers: GNUNET_YES/NO
+   */
+  int connected_COMM_service;
+
+  /**
+   * Are we connected to all peers: GNUNET_YES/NO
+   */
+  int connected_PEERS;
+
+  /**
+   * Are we connected to all slave peers on CORE level: GNUNET_YES/NO
+   */
+  int connected_CORE;
+
+  /**
+   * Are we connected to CORE service of all peers: GNUNET_YES/NO
+   */
+  int benchmarking;
+};
+
+
+struct GNUNET_ATS_TEST_Topology
+{
+  /**
+   * Shutdown task
+   */
+  GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+
+  /**
+   * Progress task
+   */
+  GNUNET_SCHEDULER_TaskIdentifier progress_task;
+
+  /**
+   * Test result
+   */
+  int result;
+
+  /**Test core (GNUNET_YES) or transport (GNUNET_NO)
+   */
+  int test_core;
+
+  /**
+   * Solver string
+   */
+  char *solver;
+
+  /**
+   * Preference string
+   */
+  char *testname;
+
+  /**
+   * Preference string
+   */
+  char *pref_str;
+
+  /**
+   * ATS preference value
+   */
+  int pref_val;
+
+  /**
+   * Number master peers
+   */
+  unsigned int num_masters;
+
+  /**
+   * Array of master peers
+   */
+  struct BenchmarkPeer *mps;
+
+  /**
+   * Number slave peers
+   */
+  unsigned int num_slaves;
+
+  /**
+   * Array of slave peers
+   */
+  struct BenchmarkPeer *sps;
+
+  /**
+   * Benchmark duration
+   */
+  struct GNUNET_TIME_Relative perf_duration;
+
+  /**
+   * Logging frequency
+   */
+  struct GNUNET_TIME_Relative log_frequency;
+
+  /**
+   * Benchmark state
+   */
+  struct BenchmarkState state;
+
+  struct GNUNET_CORE_MessageHandler *handlers;
+
+  GNUNET_TRANSPORT_ReceiveCallback transport_recv_cb;
+
+  GNUNET_ATS_TEST_TopologySetupDoneCallback done_cb;
+  GNUNET_ATS_AddressInformationCallback ats_perf_cb;
+  void *done_cb_cls;
+};
+
+
+
+/*
+ * Experiment related functions
+ */
+
+
+/**
+ * Execute the specified experiment
+ *
+ * @param e the Experiment
+ * @param ep_done_cb a episode is completed
+ * @param e_done_cb the experiment is completed
+ */
+void
+GNUNET_ATS_TEST_experimentation_run (struct Experiment *e,
+    GNUNET_ATS_TESTING_EpisodeDoneCallback ep_done_cb,
+    GNUNET_ATS_TESTING_ExperimentDoneCallback e_done_cb);
+
+/**
+ * Load an experiment from a file
+ *
+ * @param filename the file
+ * @return the Experiment or NULL on failure
+ */
+struct Experiment *
+GNUNET_ATS_TEST_experimentation_load (char *filename);
+
+
+/**
+ * Stop an experiment
+ *
+ * @param e the experiment
+ */
+void
+GNUNET_ATS_TEST_experimentation_stop (struct Experiment *e);
+
+/*
+ * Traffic related functions
+ */
+
+void
+GNUNET_ATS_TEST_traffic_handle_ping (struct BenchmarkPartner *p);
+
+void
+GNUNET_ATS_TEST_traffic_handle_pong (struct BenchmarkPartner *p);
+
+
+/**
+ * Generate between the source master and the partner and send traffic with a
+ * maximum rate.
+ *
+ * @param src traffic source
+ * @param dest traffic partner
+ * @param type type of traffic to generate
+ * @param base_rate traffic base rate to send data with
+ * @param max_rate  traffic maximum rate to send data with
+ * @param period duration of a period of traffic generation (~ 1/frequency)
+ * @param duration how long to generate traffic
+ * @return the traffic generator
+ */
+struct TrafficGenerator *
+GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src,
+    struct BenchmarkPartner *dest,
+    enum GeneratorType type,
+    long int base_rate,
+    long int max_rate,
+    struct GNUNET_TIME_Relative period,
+    struct GNUNET_TIME_Relative duration);
+
+void
+GNUNET_ATS_TEST_generate_traffic_stop (struct TrafficGenerator *tg);
+
+/**
+ * Stop all traffic generators
+ */
+void
+GNUNET_ATS_TEST_generate_traffic_stop_all ();
+
+struct PreferenceGenerator *
+GNUNET_ATS_TEST_generate_preferences_start (struct BenchmarkPeer *src,
+    struct BenchmarkPartner *dest,
+    enum GeneratorType type,
+    long int base_value,
+    long int value_rate,
+    struct GNUNET_TIME_Relative period,
+    struct GNUNET_TIME_Relative frequency,
+    enum GNUNET_ATS_PreferenceKind kind);
+
+void
+GNUNET_ATS_TEST_generate_preferences_stop (struct PreferenceGenerator *pg);
+
+void
+GNUNET_ATS_TEST_generate_preferences_stop_all ();
+
+/*
+ * Logging related functions
+ */
+
+
+
+/*
+ * Topology related functions
+ */
+
+struct BenchmarkPeer *
+GNUNET_ATS_TEST_get_peer (int src);
+
+struct BenchmarkPartner *
+GNUNET_ATS_TEST_get_partner (int src, int dest);
+
+/**
+ * Create a topology for ats testing
+ *
+ * @param name test name
+ * @param cfg_file configuration file to use for the peers
+ * @param num_slaves number of slaves
+ * @param num_masters number of masters
+ * @param test_core connect to CORE service (GNUNET_YES) or transport (GNUNET_NO)
+ * @param done_cb function to call when topology is setup
+ * @param done_cb_cls cls for callback
+ * @param recv_cb callback to call when data are received
+ * @param perf_cb callback to call when performance info are received
+ */
+void
+GNUNET_ATS_TEST_create_topology (char *name, char *cfg_file,
+    unsigned int num_slaves,
+    unsigned int num_masters,
+    int test_core,
+    GNUNET_ATS_TEST_TopologySetupDoneCallback done_cb,
+    void *done_cb_cls,
+    GNUNET_TRANSPORT_ReceiveCallback recv_cb,
+    GNUNET_ATS_TEST_LogRequest ats_perf_cb);
+
+/**
+ * Shutdown topology
+ */
+void
+GNUNET_ATS_TEST_shutdown_topology (void);
+#endif
+/* end of file ats-testing.h */