diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-12-27 15:45:39 +0900 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-12-27 15:45:39 +0900 |
commit | e5f111295be7ce2274329639d65a2d70c3253c20 (patch) | |
tree | bf6232a2c2d7b3a1c3be64c43e98af8281e46c34 /src | |
parent | 44f0712f20579a9b22a4e93f92d771870382f20e (diff) | |
download | gnunet-e5f111295be7ce2274329639d65a2d70c3253c20.tar.gz gnunet-e5f111295be7ce2274329639d65a2d70c3253c20.zip |
minor test runn modification
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/test_communicator_basic.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/src/transport/test_communicator_basic.c b/src/transport/test_communicator_basic.c index db396ba66..95e659726 100644 --- a/src/transport/test_communicator_basic.c +++ b/src/transport/test_communicator_basic.c | |||
@@ -74,9 +74,7 @@ static struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorQueue *my_tc; | |||
74 | 74 | ||
75 | #define BURST_PACKETS 5000 | 75 | #define BURST_PACKETS 5000 |
76 | 76 | ||
77 | #define FIXME_DEAD_BURST_RUNS 1 | 77 | #define TOTAL_ITERATIONS 5 |
78 | |||
79 | #define TOTAL_ITERATIONS 20 | ||
80 | 78 | ||
81 | static unsigned int iterations_left = TOTAL_ITERATIONS; | 79 | static unsigned int iterations_left = TOTAL_ITERATIONS; |
82 | 80 | ||
@@ -367,16 +365,19 @@ incoming_message_cb (void *cls, | |||
367 | { | 365 | { |
368 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, | 366 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
369 | "Short size packet test done.\n"); | 367 | "Short size packet test done.\n"); |
368 | char *goodput = GNUNET_STRINGS_byte_size_fancy ((SHORT_MESSAGE_SIZE | ||
369 | * num_received) | ||
370 | / (duration.rel_value_us | ||
371 | / | ||
372 | 1000)); | ||
370 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, | 373 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
371 | "%lu/%lu packets in %llu us (%llu kb/s) -- avg latency: %llu us\n", | 374 | "%lu/%lu packets in %llu us (%s/s) -- avg latency: %llu us\n", |
372 | (unsigned long) num_received, | 375 | (unsigned long) num_received, |
373 | (unsigned long) num_sent, | 376 | (unsigned long) num_sent, |
374 | (unsigned long long) duration.rel_value_us, | 377 | (unsigned long long) duration.rel_value_us, |
375 | (unsigned long long) ((SHORT_MESSAGE_SIZE * num_received) | 378 | goodput, |
376 | / (duration.rel_value_us | ||
377 | / | ||
378 | 1000)), | ||
379 | (unsigned long long) avg_latency); | 379 | (unsigned long long) avg_latency); |
380 | GNUNET_free (goodput); | ||
380 | start_long = GNUNET_TIME_absolute_get (); | 381 | start_long = GNUNET_TIME_absolute_get (); |
381 | phase = TP_BURST_LONG; | 382 | phase = TP_BURST_LONG; |
382 | num_sent = 0; | 383 | num_sent = 0; |
@@ -402,16 +403,20 @@ incoming_message_cb (void *cls, | |||
402 | { | 403 | { |
403 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, | 404 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
404 | "Long size packet test done.\n"); | 405 | "Long size packet test done.\n"); |
406 | char *goodput = GNUNET_STRINGS_byte_size_fancy ((LONG_MESSAGE_SIZE | ||
407 | * num_received) | ||
408 | / (duration.rel_value_us | ||
409 | / | ||
410 | 1000)); | ||
411 | |||
405 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, | 412 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
406 | "%lu/%lu packets in %llu us (%llu kb/s) -- avg latency: %llu us\n", | 413 | "%lu/%lu packets in %llu us (%s/s) -- avg latency: %llu us\n", |
407 | (unsigned long) num_received, | 414 | (unsigned long) num_received, |
408 | (unsigned long) num_sent, | 415 | (unsigned long) num_sent, |
409 | (unsigned long long) duration.rel_value_us, | 416 | (unsigned long long) duration.rel_value_us, |
410 | (unsigned long long) ((LONG_MESSAGE_SIZE * num_received) | 417 | goodput, |
411 | / (duration.rel_value_us | ||
412 | / | ||
413 | 1000)), | ||
414 | (unsigned long long) avg_latency); | 418 | (unsigned long long) avg_latency); |
419 | GNUNET_free (goodput); | ||
415 | ack = 10; | 420 | ack = 10; |
416 | phase = TP_SIZE_CHECK; | 421 | phase = TP_SIZE_CHECK; |
417 | num_received = 0; | 422 | num_received = 0; |