more accurate calculation

diff --git a/src/transport/test_communicator_basic.c b/src/transport/test_communicator_basic.c
index e11fb09eb63dd6a0dbe85055c056d394474961c6..0d6df751a4a169a7c69d64f07f8418c5772347a0 100644 (file)
--- a/src/transport/test_communicator_basic.c
+++ b/src/transport/test_communicator_basic.c
@@ -366,12 +366,8 @@ incoming_message_cb (void *cls,
         GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
                     "Short size packet test done.\n");
         char *goodput = GNUNET_STRINGS_byte_size_fancy ((SHORT_MESSAGE_SIZE
-                                                         * num_received)
-                                                        / (GNUNET_MAX (1,
-                                                                       duration.
-                                                                       rel_value_us
-                                                                       / (1000
-                                                                          * 1000))));
+                                                          * num_received * 1000 * 1000)
+                                                         / duration.rel_value_us);
         GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
                     "%lu/%lu packets in %llu us (%s/s) -- avg latency: %llu us\n",
                     (unsigned long) num_received,
@@ -406,12 +402,8 @@ incoming_message_cb (void *cls,
         GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
                     "Long size packet test done.\n");
         char *goodput = GNUNET_STRINGS_byte_size_fancy ((LONG_MESSAGE_SIZE
-                                                         * num_received)
-                                                        / (GNUNET_MAX (1,
-                                                                       duration.
-                                                                       rel_value_us
-                                                                       / (1000
-                                                                          * 1000))));
+                                                          * num_received * 1000 * 1000)
+                                                         / duration.rel_value_us);
 
         GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
                     "%lu/%lu packets in %llu us (%s/s) -- avg latency: %llu us\n",