diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-12-30 23:49:47 +0900 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-12-30 23:49:47 +0900 |
commit | 8e2b774ff6804ca655243ad17c6e20857857f3ef (patch) | |
tree | 311b6cadc03cba2c452fc94dd89149404c05890f | |
parent | e5f111295be7ce2274329639d65a2d70c3253c20 (diff) | |
download | gnunet-8e2b774ff6804ca655243ad17c6e20857857f3ef.tar.gz gnunet-8e2b774ff6804ca655243ad17c6e20857857f3ef.zip |
fix test
-rw-r--r-- | src/transport/test_communicator_basic.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/transport/test_communicator_basic.c b/src/transport/test_communicator_basic.c index 95e659726..437659aef 100644 --- a/src/transport/test_communicator_basic.c +++ b/src/transport/test_communicator_basic.c | |||
@@ -320,7 +320,7 @@ update_avg_latency (const char*payload) | |||
320 | ts_n = (struct GNUNET_TIME_AbsoluteNBO *) payload; | 320 | ts_n = (struct GNUNET_TIME_AbsoluteNBO *) payload; |
321 | ts = GNUNET_TIME_absolute_ntoh (*ts_n); | 321 | ts = GNUNET_TIME_absolute_ntoh (*ts_n); |
322 | latency = GNUNET_TIME_absolute_get_duration (ts); | 322 | latency = GNUNET_TIME_absolute_get_duration (ts); |
323 | if (1 == num_received) | 323 | if (1 >= num_received) |
324 | avg_latency = latency.rel_value_us; | 324 | avg_latency = latency.rel_value_us; |
325 | else | 325 | else |
326 | avg_latency = ((avg_latency * (num_received - 1)) + latency.rel_value_us) | 326 | avg_latency = ((avg_latency * (num_received - 1)) + latency.rel_value_us) |
@@ -367,9 +367,11 @@ incoming_message_cb (void *cls, | |||
367 | "Short size packet test done.\n"); | 367 | "Short size packet test done.\n"); |
368 | char *goodput = GNUNET_STRINGS_byte_size_fancy ((SHORT_MESSAGE_SIZE | 368 | char *goodput = GNUNET_STRINGS_byte_size_fancy ((SHORT_MESSAGE_SIZE |
369 | * num_received) | 369 | * num_received) |
370 | / (duration.rel_value_us | 370 | / (GNUNET_MAX (1, |
371 | / | 371 | duration. |
372 | 1000)); | 372 | rel_value_us |
373 | / (1000 | ||
374 | * 1000)))); | ||
373 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, | 375 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
374 | "%lu/%lu packets in %llu us (%s/s) -- avg latency: %llu us\n", | 376 | "%lu/%lu packets in %llu us (%s/s) -- avg latency: %llu us\n", |
375 | (unsigned long) num_received, | 377 | (unsigned long) num_received, |
@@ -405,16 +407,18 @@ incoming_message_cb (void *cls, | |||
405 | "Long size packet test done.\n"); | 407 | "Long size packet test done.\n"); |
406 | char *goodput = GNUNET_STRINGS_byte_size_fancy ((LONG_MESSAGE_SIZE | 408 | char *goodput = GNUNET_STRINGS_byte_size_fancy ((LONG_MESSAGE_SIZE |
407 | * num_received) | 409 | * num_received) |
408 | / (duration.rel_value_us | 410 | / (GNUNET_MAX (1, |
409 | / | 411 | duration. |
410 | 1000)); | 412 | rel_value_us |
413 | / (1000 | ||
414 | * 1000)))); | ||
411 | 415 | ||
412 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, | 416 | GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, |
413 | "%lu/%lu packets in %llu us (%s/s) -- avg latency: %llu us\n", | 417 | "%lu/%lu packets in %llu us (%s/s) -- avg latency: %llu us\n", |
414 | (unsigned long) num_received, | 418 | (unsigned long) num_received, |
415 | (unsigned long) num_sent, | 419 | (unsigned long) num_sent, |
416 | (unsigned long long) duration.rel_value_us, | 420 | (unsigned long long) duration.rel_value_us, |
417 | goodput, | 421 | goodput, |
418 | (unsigned long long) avg_latency); | 422 | (unsigned long long) avg_latency); |
419 | GNUNET_free (goodput); | 423 | GNUNET_free (goodput); |
420 | ack = 10; | 424 | ack = 10; |
@@ -446,6 +450,7 @@ incoming_message_cb (void *cls, | |||
446 | iterations_left--; | 450 | iterations_left--; |
447 | if (0 != iterations_left) | 451 | if (0 != iterations_left) |
448 | { | 452 | { |
453 | start_short = GNUNET_TIME_absolute_get (); | ||
449 | phase = TP_BURST_SHORT; | 454 | phase = TP_BURST_SHORT; |
450 | active_task = GNUNET_SCHEDULER_add_now (&short_test, | 455 | active_task = GNUNET_SCHEDULER_add_now (&short_test, |
451 | NULL); | 456 | NULL); |