[GNUnet-SVN] r17603 - gnunet/src/ats

[gnunet]

Author: grothoff
Date: 2011-10-19 15:09:56 +0200 (Wed, 19 Oct 2011)
New Revision: 17603

Modified:
   gnunet/src/ats/gnunet-service-ats_performance.c
   gnunet/src/ats/gnunet-service-ats_reservations.c
Log:
major bugfixes in performance api implementation, some logging

Modified: gnunet/src/ats/gnunet-service-ats_performance.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_performance.c     2011-10-19 12:46:29 UTC 
(rev 17602)
+++ gnunet/src/ats/gnunet-service-ats_performance.c     2011-10-19 13:09:56 UTC 
(rev 17603)
@@ -271,7 +271,7 @@
   }
   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);

Modified: gnunet/src/ats/gnunet-service-ats_reservations.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_reservations.c    2011-10-19 12:46:29 UTC 
(rev 17602)
+++ gnunet/src/ats/gnunet-service-ats_reservations.c    2011-10-19 13:09:56 UTC 
(rev 17603)
@@ -60,16 +60,25 @@
   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;
 }