X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Fgnunet-service-ats_reservations.c;h=cb95ad80f248e765e4ad73b808e5e6c37b0fca85;hb=bfdb0abc074a99a7d24ca408f38cfda128d4132b;hp=492751254a8d6f3e46991fb9e731f161351fa999;hpb=50d9ee637d9604d52c108894cdf02f10950ebd13;p=oweals%2Fgnunet.git

diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c
index 492751254..cb95ad80f 100644
--- a/src/ats/gnunet-service-ats_reservations.c
+++ b/src/ats/gnunet-service-ats_reservations.c
@@ -27,7 +27,7 @@
 #include "gnunet-service-ats_reservations.h"
 
 /**
- * Number of seconds that available bandwidth carries over 
+ * Number of seconds that available bandwidth carries over
  * (can accumulate).
  */
 #define MAX_BANDWIDTH_CARRY_S 5
@@ -36,7 +36,7 @@
 /**
  * Map of peer identities to 'struct GNUNET_BANDWIDTH_Tracker *'s
  */
-static struct GNUNET_CONTAINER_MultiHashMap *trackers;
+static struct GNUNET_CONTAINER_MultiPeerMap *trackers;
 
 
 /**
@@ -52,32 +52,29 @@ static struct GNUNET_CONTAINER_MultiHashMap *trackers;
  */
 struct GNUNET_TIME_Relative
 GAS_reservations_reserve (const struct GNUNET_PeerIdentity *peer,
-			  int32_t amount)
+                          int32_t amount)
 {
   struct GNUNET_BANDWIDTH_Tracker *tracker;
   struct GNUNET_TIME_Relative ret;
 
-  tracker = GNUNET_CONTAINER_multihashmap_get (trackers,
-					       &peer->hashPubKey);
+  tracker = GNUNET_CONTAINER_multipeermap_get (trackers, peer);
   if (NULL == tracker)
-    return GNUNET_TIME_UNIT_ZERO; /* not connected, satisfy now */
+    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)
+    ret = GNUNET_BANDWIDTH_tracker_get_delay (tracker, amount);
+    if (ret.rel_value_us > 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);
+                  "Delay to satisfy reservation for %d bytes is %s\n",
+                  (int) amount,
+		  GNUNET_STRINGS_relative_time_to_string (ret,
+							  GNUNET_YES));
       return ret;
     }
   }
   (void) GNUNET_BANDWIDTH_tracker_consume (tracker, amount);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-	      "Reserved %d bytes\n",
-	      (int) amount);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reserved %d bytes\n", (int) amount);
   return GNUNET_TIME_UNIT_ZERO;
 }
 
@@ -85,42 +82,40 @@ GAS_reservations_reserve (const struct GNUNET_PeerIdentity *peer,
 /**
  * Set the amount of bandwidth the other peer could currently transmit
  * to us (as far as we know) to the given value.
- * 
+ *
  * @param peer identity of the peer
  * @param bandwidth_in currently available bandwidth from that peer to
  *        this peer (estimate)
  */
 void
 GAS_reservations_set_bandwidth (const struct GNUNET_PeerIdentity *peer,
-				struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
+                                struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
 {
   struct GNUNET_BANDWIDTH_Tracker *tracker;
 
-  tracker = GNUNET_CONTAINER_multihashmap_get (trackers,
-					       &peer->hashPubKey);
+  tracker = GNUNET_CONTAINER_multipeermap_get (trackers, peer);
   if (0 == ntohl (bandwidth_in.value__))
   {
+    if (NULL == tracker)
+      return;
     GNUNET_assert (GNUNET_YES ==
-		   GNUNET_CONTAINER_multihashmap_remove (trackers,
-							 &peer->hashPubKey,
-							 tracker));
+                   GNUNET_CONTAINER_multipeermap_remove (trackers,
+                                                         peer,
+                                                         tracker));
     GNUNET_free (tracker);
     return;
   }
   if (NULL == tracker)
   {
-    tracker = GNUNET_malloc (sizeof (struct GNUNET_BANDWIDTH_Tracker));
-    GNUNET_BANDWIDTH_tracker_init (tracker,
-				   bandwidth_in,
-				   MAX_BANDWIDTH_CARRY_S);
-    GNUNET_CONTAINER_multihashmap_put (trackers,
-				       &peer->hashPubKey,
-				       tracker,
-				       GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+    tracker = GNUNET_new (struct GNUNET_BANDWIDTH_Tracker);
+    GNUNET_BANDWIDTH_tracker_init (tracker, NULL, NULL, bandwidth_in,
+                                   MAX_BANDWIDTH_CARRY_S);
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_CONTAINER_multipeermap_put (trackers, peer, tracker,
+                                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
     return;
   }
-  GNUNET_BANDWIDTH_tracker_update_quota (tracker,
-					 bandwidth_in);
+  GNUNET_BANDWIDTH_tracker_update_quota (tracker, bandwidth_in);
 }
 
 
@@ -130,7 +125,7 @@ GAS_reservations_set_bandwidth (const struct GNUNET_PeerIdentity *peer,
 void
 GAS_reservations_init ()
 {
-  trackers = GNUNET_CONTAINER_multihashmap_create(128);
+  trackers = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_NO);
 }
 
 
@@ -142,10 +137,9 @@ GAS_reservations_init ()
  * @param value the 'struct GNUNET_BANDWIDTH_Tracker' to free
  * @return GNUNET_OK (continue to iterate)
  */
-static int 
+static int
 free_tracker (void *cls,
-	      const GNUNET_HashCode * key,
-	      void *value)
+	      const struct GNUNET_PeerIdentity *key, void *value)
 {
   struct GNUNET_BANDWIDTH_Tracker *tracker = value;
 
@@ -160,8 +154,8 @@ free_tracker (void *cls,
 void
 GAS_reservations_done ()
 {
-  GNUNET_CONTAINER_multihashmap_iterate (trackers, &free_tracker, NULL);
-  GNUNET_CONTAINER_multihashmap_destroy (trackers);
+  GNUNET_CONTAINER_multipeermap_iterate (trackers, &free_tracker, NULL);
+  GNUNET_CONTAINER_multipeermap_destroy (trackers);
 }
 
 /* end of gnunet-service-ats_reservations.c */