From ca31992cb873c9cad826841ebae014ef2d614cf5 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 19 Oct 2011 13:09:56 +0000 Subject: [PATCH] major bugfixes in performance api implementation, some logging --- src/ats/gnunet-service-ats_performance.c | 2 +- src/ats/gnunet-service-ats_reservations.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c index 24450031f..19015a365 100644 --- a/src/ats/gnunet-service-ats_performance.c +++ b/src/ats/gnunet-service-ats_performance.c @@ -271,7 +271,7 @@ GAS_handle_preference_change (void *cls, struct GNUNET_SERVER_Client *client, } msg = (const struct ChangePreferenceMessage *) message; nump = ntohl (msg->num_preferences); - if (msize != sizeof (struct ChangePreferenceMessage) * nump * sizeof (struct PreferenceInformation)) + if (msize != sizeof (struct ChangePreferenceMessage) + nump * sizeof (struct PreferenceInformation)) { GNUNET_break (0); GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c index 96ab1cdb2..bdc1e64c3 100644 --- a/src/ats/gnunet-service-ats_reservations.c +++ b/src/ats/gnunet-service-ats_reservations.c @@ -60,16 +60,25 @@ GAS_reservations_reserve (const struct GNUNET_PeerIdentity *peer, tracker = GNUNET_CONTAINER_multihashmap_get (trackers, &peer->hashPubKey); if (NULL == tracker) - return GNUNET_TIME_UNIT_FOREVER_REL; + return GNUNET_TIME_UNIT_ZERO; /* not connected, satisfy now */ if (amount >= 0) { ret = GNUNET_BANDWIDTH_tracker_get_delay (tracker, amount); if (ret.rel_value > 0) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Delay to satisfy reservation for %d bytes is %llu ms\n", + (int) amount, + (unsigned long long) ret.rel_value); return ret; + } } GNUNET_break (GNUNET_NO == /* no == not above limit */ GNUNET_BANDWIDTH_tracker_consume (tracker, amount)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Reserved %d bytes\n", + (int) amount); return GNUNET_TIME_UNIT_ZERO; } -- 2.25.1