[gnunet] 02/02: merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit c1cf4ec20a9a3f5e804e83986dbdb8b8a0bb9ce5
Merge: 025568d66 1a4bd09e6
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Dec 26 02:21:17 2019 +0900

    merge

 contrib/build-common                         |  2 +-
 src/include/gnunet_common.h                  | 14 +++++++
 src/transport/test_communicator_basic.c      | 57 ++++++++++------------------
 src/transport/transport_api2_communication.c |  6 ++-
 src/util/.gitignore                          |  1 +
 src/util/common_allocation.c                 | 27 ++++++++++++-
 src/util/common_endian.c                     |  8 ++++
 src/util/perf_malloc.c                       | 39 +++++++++++++++++--
 8 files changed, 110 insertions(+), 44 deletions(-)

diff --cc src/transport/test_communicator_basic.c
index 4dba9d50c,e9b982897..db396ba66
--- a/src/transport/test_communicator_basic.c
+++ b/src/transport/test_communicator_basic.c
@@@ -196,9 -198,18 +198,17 @@@ static voi
  latency_timeout (void *cls)
  {
    to_task = NULL;
+   if (GNUNET_TIME_absolute_get_remaining (timeout).rel_value_us > 0)
+   {
+     to_task = GNUNET_SCHEDULER_add_at (timeout,
+                                        &latency_timeout,
+                                        NULL);
+     return;
+   }
+ 
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
 -              "Latency too high. Test failed. (Phase: %d. Received: %lu\n",
 -              phase,
 -              num_received);
 +              "Latency too high. Test failed. (Phase: %d. Sent: %lu, 
Received: %lu)\n",
 +              phase, num_sent, num_received);
    ret = 2;
    GNUNET_SCHEDULER_shutdown ();
  }

-- 
To stop receiving notification emails like this one, please contact
address@hidden.