[GNUnet-SVN] r32141 - gnunet/src/ats-tests

[gnunet]

Author: wachs
Date: 2014-01-31 17:30:22 +0100 (Fri, 31 Jan 2014)
New Revision: 32141

Modified:
   gnunet/src/ats-tests/ats-testing-traffic.c
   gnunet/src/ats-tests/gnunet-ats-sim.c
Log:
sinus support for traffic generator


Modified: gnunet/src/ats-tests/ats-testing-traffic.c
===================================================================
--- gnunet/src/ats-tests/ats-testing-traffic.c  2014-01-31 16:13:14 UTC (rev 
32140)
+++ gnunet/src/ats-tests/ats-testing-traffic.c  2014-01-31 16:30:22 UTC (rev 
32141)
@@ -61,7 +61,12 @@
       GNUNET_break (0);
       break;
     case GNUNET_ATS_TEST_TG_SINUS:
-      GNUNET_break (0);
+      time_delta = GNUNET_TIME_absolute_get_duration(tg->time_start);
+      time_delta.rel_value_us = time_delta.rel_value_us % 
tg->duration_period.rel_value_us;
+      delta_rate = (tg->max_rate - tg->base_rate) *
+          sin ( (2 * M_PI) / ((double) tg->duration_period.rel_value_us) * 
time_delta.rel_value_us);
+      //fprintf (stderr, "delta_rate %i\n", delta_rate);
+      cur_rate = tg->base_rate + delta_rate;
       break;
     default:
       return delay;
@@ -128,8 +133,9 @@
     return TEST_MESSAGE_SIZE;
   }
   delay = get_delay (p->tg);
+  /*
   fprintf (stderr, "Delay for next transmission %llu ms\n",
-      (long long unsigned int) delay.rel_value_us / 1000);
+      (long long unsigned int) delay.rel_value_us / 1000);*/
   p->tg->next_ping_transmission = 
GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(),
       delay);
 

Modified: gnunet/src/ats-tests/gnunet-ats-sim.c
===================================================================
--- gnunet/src/ats-tests/gnunet-ats-sim.c       2014-01-31 16:13:14 UTC (rev 
32140)
+++ gnunet/src/ats-tests/gnunet-ats-sim.c       2014-01-31 16:30:22 UTC (rev 
32141)
@@ -224,6 +224,13 @@
             GNUNET_TIME_UNIT_MINUTES,
             GNUNET_TIME_UNIT_FOREVER_REL);
         */
+        GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m],
+            &masters[c_m].partners[c_s],
+            GNUNET_ATS_TEST_TG_SINUS,
+            1000,
+            1500,
+            GNUNET_TIME_UNIT_SECONDS,
+            GNUNET_TIME_UNIT_FOREVER_REL);
       }
   }