diff options
Diffstat (limited to 'src/ats-tests/ats-testing-traffic.c')
-rw-r--r-- | src/ats-tests/ats-testing-traffic.c | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/src/ats-tests/ats-testing-traffic.c b/src/ats-tests/ats-testing-traffic.c index 5eb01bd55..f0bab7367 100644 --- a/src/ats-tests/ats-testing-traffic.c +++ b/src/ats-tests/ats-testing-traffic.c | |||
@@ -93,8 +93,9 @@ get_delay (struct TrafficGenerator *tg) | |||
93 | delay.rel_value_us = GNUNET_TIME_UNIT_SECONDS.rel_value_us * TEST_MESSAGE_SIZE / cur_rate; | 93 | delay.rel_value_us = GNUNET_TIME_UNIT_SECONDS.rel_value_us * TEST_MESSAGE_SIZE / cur_rate; |
94 | 94 | ||
95 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 95 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
96 | "Current rate is %u, calculated delay is %u \n", | 96 | "Current rate is %lld, calculated delay is %llu\n", |
97 | cur_rate, delay.rel_value_us); | 97 | cur_rate, |
98 | (unsigned long long) delay.rel_value_us); | ||
98 | return delay; | 99 | return delay; |
99 | } | 100 | } |
100 | 101 | ||
@@ -308,12 +309,12 @@ GNUNET_ATS_TEST_traffic_handle_pong (struct BenchmarkPartner *p) | |||
308 | */ | 309 | */ |
309 | struct TrafficGenerator * | 310 | struct TrafficGenerator * |
310 | GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src, | 311 | GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src, |
311 | struct BenchmarkPartner *dest, | 312 | struct BenchmarkPartner *dest, |
312 | enum GeneratorType type, | 313 | enum GeneratorType type, |
313 | long int base_rate, | 314 | unsigned int base_rate, |
314 | long int max_rate, | 315 | unsigned int max_rate, |
315 | struct GNUNET_TIME_Relative period, | 316 | struct GNUNET_TIME_Relative period, |
316 | struct GNUNET_TIME_Relative duration) | 317 | struct GNUNET_TIME_Relative duration) |
317 | { | 318 | { |
318 | struct TrafficGenerator *tg; | 319 | struct TrafficGenerator *tg; |
319 | 320 | ||
@@ -337,31 +338,32 @@ GNUNET_ATS_TEST_generate_traffic_start (struct BenchmarkPeer *src, | |||
337 | switch (type) { | 338 | switch (type) { |
338 | case GNUNET_ATS_TEST_TG_CONSTANT: | 339 | case GNUNET_ATS_TEST_TG_CONSTANT: |
339 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 340 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
340 | "Setting up constant traffic generator master[%u] `%s' and slave [%u] `%s' max %u Bips\n", | 341 | "Setting up constant traffic generator master[%u] `%s' and slave [%u] `%s' max %u Bips\n", |
341 | dest->me->no, GNUNET_i2s (&dest->me->id), | 342 | dest->me->no, GNUNET_i2s (&dest->me->id), |
342 | dest->dest->no, GNUNET_i2s (&dest->dest->id), | 343 | dest->dest->no, GNUNET_i2s (&dest->dest->id), |
343 | base_rate); | 344 | base_rate); |
344 | break; | 345 | break; |
345 | case GNUNET_ATS_TEST_TG_LINEAR: | 346 | case GNUNET_ATS_TEST_TG_LINEAR: |
346 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 347 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
347 | "Setting up linear traffic generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bips\n", | 348 | "Setting up linear traffic generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bips\n", |
348 | dest->me->no, GNUNET_i2s (&dest->me->id), | 349 | dest->me->no, GNUNET_i2s (&dest->me->id), |
349 | dest->dest->no, GNUNET_i2s (&dest->dest->id), | 350 | dest->dest->no, GNUNET_i2s (&dest->dest->id), |
350 | base_rate, max_rate); | 351 | base_rate, |
352 | max_rate); | ||
351 | break; | 353 | break; |
352 | case GNUNET_ATS_TEST_TG_SINUS: | 354 | case GNUNET_ATS_TEST_TG_SINUS: |
353 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 355 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
354 | "Setting up sinus traffic generator master[%u] `%s' and slave [%u] `%s' baserate %u Bips, amplitude %u Bps\n", | 356 | "Setting up sinus traffic generator master[%u] `%s' and slave [%u] `%s' baserate %u Bips, amplitude %u Bps\n", |
355 | dest->me->no, GNUNET_i2s (&dest->me->id), | 357 | dest->me->no, GNUNET_i2s (&dest->me->id), |
356 | dest->dest->no, GNUNET_i2s (&dest->dest->id), | 358 | dest->dest->no, GNUNET_i2s (&dest->dest->id), |
357 | base_rate, max_rate); | 359 | base_rate, max_rate); |
358 | break; | 360 | break; |
359 | case GNUNET_ATS_TEST_TG_RANDOM: | 361 | case GNUNET_ATS_TEST_TG_RANDOM: |
360 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 362 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
361 | "Setting up random traffic generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bps\n", | 363 | "Setting up random traffic generator master[%u] `%s' and slave [%u] `%s' min %u Bips max %u Bps\n", |
362 | dest->me->no, GNUNET_i2s (&dest->me->id), | 364 | dest->me->no, GNUNET_i2s (&dest->me->id), |
363 | dest->dest->no, GNUNET_i2s (&dest->dest->id), | 365 | dest->dest->no, GNUNET_i2s (&dest->dest->id), |
364 | base_rate, max_rate); | 366 | base_rate, max_rate); |
365 | break; | 367 | break; |
366 | default: | 368 | default: |
367 | break; | 369 | break; |