constant traffic generator

3 files changed, 39 insertions, 8 deletions

diff --git a/src/ats-tests/ats-testing-traffic.c b/src/ats-tests/ats-testing-traffic.c
index ecee76816..21e9723b6 100644
--- a/src/ats-tests/ats-testing-traffic.c
+++ b/src/ats-tests/ats-testing-traffic.c
@@ -32,6 +32,28 @@ static struct TrafficGenerator *tg_tail;
 
 extern struct GNUNET_ATS_TEST_Topology *top;
 
+static struct GNUNET_TIME_Relative
+get_delay (struct TrafficGenerator *tg)
+{
+  struct GNUNET_TIME_Relative delay;
+  delay.rel_value_us = 0;
+
+  switch (tg->type) {
+    case GNUNET_ATS_TEST_TG_CONSTANT:
+      if (UINT32_MAX == tg->rate)
+        delay.rel_value_us = 0;
+      else if (tg->rate <= TEST_MESSAGE_SIZE)
+        delay.rel_value_us = (GNUNET_TIME_UNIT_SECONDS.rel_value_us);
+      else
+        delay.rel_value_us = (GNUNET_TIME_UNIT_SECONDS.rel_value_us / (tg->rate / TEST_MESSAGE_SIZE));
+      break;
+    default:
+      return delay;
+      break;
+  }
+  return delay;
+}
+
 static size_t
 send_ping_ready_cb (void *cls, size_t size, void *buf)
 {
@@ -86,7 +108,8 @@ send_ping_ready_cb (void *cls, size_t size, void *buf)
     GNUNET_break (0);
     return TEST_MESSAGE_SIZE;
   }
-  p->tg->next_ping_transmission = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), p->tg->delta);
+  p->tg->next_ping_transmission = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(),
+      get_delay (p->tg));
 
   return TEST_MESSAGE_SIZE;
 }
@@ -209,15 +232,16 @@ GNUNET_ATS_TEST_traffic_handle_pong (struct BenchmarkPartner *p)
   }
 }
 
+
 /**
  * Generate between the source master and the partner and send traffic with a
  * maximum rate.
  *
  */
-
 struct TrafficGenerator *
 GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src,
     struct BenchmarkPartner *dest,
+    enum TrafficGeneratorType type,
     unsigned int rate,
     struct GNUNET_TIME_Relative duration)
 {
@@ -232,15 +256,10 @@ GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src,
 
   tg = GNUNET_new (struct TrafficGenerator);
   GNUNET_CONTAINER_DLL_insert (tg_head, tg_tail, tg);
+  tg->type = type;
   tg->src = src;
   tg->dest = dest;
   tg->rate = rate;
-  if (UINT32_MAX == rate)
-    tg->delta.rel_value_us = 0;
-  else if (rate <= TEST_MESSAGE_SIZE)
-    tg->delta.rel_value_us = (GNUNET_TIME_UNIT_SECONDS.rel_value_us);
-  else
-    tg->delta.rel_value_us = (GNUNET_TIME_UNIT_SECONDS.rel_value_us / (rate / TEST_MESSAGE_SIZE));
   tg->next_ping_transmission = GNUNET_TIME_UNIT_FOREVER_ABS;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
diff --git a/src/ats-tests/ats-testing.h b/src/ats-tests/ats-testing.h
index 59a9145d7..22c3b1419 100644
--- a/src/ats-tests/ats-testing.h
+++ b/src/ats-tests/ats-testing.h
@@ -56,6 +56,14 @@ struct TrafficGenerator;
 
 struct LoggingHandle;
 
+enum TrafficGeneratorType
+{
+  GNUNET_ATS_TEST_LINEAR,
+  GNUNET_ATS_TEST_TG_CONSTANT,
+  GNUNET_ATS_TEST_RANDOM,
+  GNUNET_ATS_TEST_SINUS
+};
+
 
 /**
  * Callback to call when topology setup is completed
@@ -215,6 +223,8 @@ struct TrafficGenerator
   struct TrafficGenerator *prev;
   struct TrafficGenerator *next;
 
+  enum TrafficGeneratorType type;
+
   struct BenchmarkPeer *src;
   struct BenchmarkPartner *dest;
   unsigned int rate;
@@ -529,6 +539,7 @@ GNUNET_ATS_TEST_traffic_handle_pong (struct BenchmarkPartner *p);
 struct TrafficGenerator *
 GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src,
     struct BenchmarkPartner *dest,
+    enum TrafficGeneratorType type,
     unsigned int rate,
     struct GNUNET_TIME_Relative duration);
 
diff --git a/src/ats-tests/gnunet-ats-sim.c b/src/ats-tests/gnunet-ats-sim.c
index 26d0d7d91..27a9dae01 100644
--- a/src/ats-tests/gnunet-ats-sim.c
+++ b/src/ats-tests/gnunet-ats-sim.c
@@ -210,6 +210,7 @@ static void topology_setup_done (void *cls,
         /* Generate maximum traffic to all peers */
         GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m],
             &masters[c_m].partners[c_s],
+            GNUNET_ATS_TEST_TG_CONSTANT,
             10000,
             GNUNET_TIME_UNIT_FOREVER_REL);
       }