diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-01-31 16:30:22 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-01-31 16:30:22 +0000 |
commit | 585bf7d499409f42a5c293119c426e2f02107768 (patch) | |
tree | e138d609a1b0df258a3c684e225fc2b12fb13d31 /src/ats-tests | |
parent | bf9c6ce12b8ad43d58cc05e62f75a86d59778f54 (diff) | |
download | gnunet-585bf7d499409f42a5c293119c426e2f02107768.tar.gz gnunet-585bf7d499409f42a5c293119c426e2f02107768.zip |
sinus support for traffic generator
Diffstat (limited to 'src/ats-tests')
-rw-r--r-- | src/ats-tests/ats-testing-traffic.c | 10 | ||||
-rw-r--r-- | src/ats-tests/gnunet-ats-sim.c | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/ats-tests/ats-testing-traffic.c b/src/ats-tests/ats-testing-traffic.c index 3019d2054..06a983d5c 100644 --- a/src/ats-tests/ats-testing-traffic.c +++ b/src/ats-tests/ats-testing-traffic.c | |||
@@ -61,7 +61,12 @@ get_delay (struct TrafficGenerator *tg) | |||
61 | GNUNET_break (0); | 61 | GNUNET_break (0); |
62 | break; | 62 | break; |
63 | case GNUNET_ATS_TEST_TG_SINUS: | 63 | case GNUNET_ATS_TEST_TG_SINUS: |
64 | GNUNET_break (0); | 64 | time_delta = GNUNET_TIME_absolute_get_duration(tg->time_start); |
65 | time_delta.rel_value_us = time_delta.rel_value_us % tg->duration_period.rel_value_us; | ||
66 | delta_rate = (tg->max_rate - tg->base_rate) * | ||
67 | sin ( (2 * M_PI) / ((double) tg->duration_period.rel_value_us) * time_delta.rel_value_us); | ||
68 | //fprintf (stderr, "delta_rate %i\n", delta_rate); | ||
69 | cur_rate = tg->base_rate + delta_rate; | ||
65 | break; | 70 | break; |
66 | default: | 71 | default: |
67 | return delay; | 72 | return delay; |
@@ -128,8 +133,9 @@ send_ping_ready_cb (void *cls, size_t size, void *buf) | |||
128 | return TEST_MESSAGE_SIZE; | 133 | return TEST_MESSAGE_SIZE; |
129 | } | 134 | } |
130 | delay = get_delay (p->tg); | 135 | delay = get_delay (p->tg); |
136 | /* | ||
131 | fprintf (stderr, "Delay for next transmission %llu ms\n", | 137 | fprintf (stderr, "Delay for next transmission %llu ms\n", |
132 | (long long unsigned int) delay.rel_value_us / 1000); | 138 | (long long unsigned int) delay.rel_value_us / 1000);*/ |
133 | p->tg->next_ping_transmission = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), | 139 | p->tg->next_ping_transmission = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), |
134 | delay); | 140 | delay); |
135 | 141 | ||
diff --git a/src/ats-tests/gnunet-ats-sim.c b/src/ats-tests/gnunet-ats-sim.c index 02441fffe..1e969689a 100644 --- a/src/ats-tests/gnunet-ats-sim.c +++ b/src/ats-tests/gnunet-ats-sim.c | |||
@@ -224,6 +224,13 @@ static void topology_setup_done (void *cls, | |||
224 | GNUNET_TIME_UNIT_MINUTES, | 224 | GNUNET_TIME_UNIT_MINUTES, |
225 | GNUNET_TIME_UNIT_FOREVER_REL); | 225 | GNUNET_TIME_UNIT_FOREVER_REL); |
226 | */ | 226 | */ |
227 | GNUNET_ATS_TEST_generate_traffic_start (&masters[c_m], | ||
228 | &masters[c_m].partners[c_s], | ||
229 | GNUNET_ATS_TEST_TG_SINUS, | ||
230 | 1000, | ||
231 | 1500, | ||
232 | GNUNET_TIME_UNIT_SECONDS, | ||
233 | GNUNET_TIME_UNIT_FOREVER_REL); | ||
227 | } | 234 | } |
228 | } | 235 | } |
229 | 236 | ||