1 files changed, 89 insertions, 93 deletions

diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c
index 6f25abfd5..d138ffba1 100644
--- a/src/util/bandwidth.c
+++ b/src/util/bandwidth.c
@@ -42,8 +42,8 @@ GNUNET_BANDWIDTH_value_init (uint32_t bytes_per_second)
 
 #if DEBUG_BANDWIDTH
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Initializing bandwidth of %u Bps\n",
-              (unsigned int) bytes_per_second);
+              "Initializing bandwidth of %u Bps\n",
+              (unsigned int) bytes_per_second);
 #endif
   ret.value__ = htonl (bytes_per_second);
   return ret;
@@ -59,10 +59,10 @@ GNUNET_BANDWIDTH_value_init (uint32_t bytes_per_second)
  */
 struct GNUNET_BANDWIDTH_Value32NBO
 GNUNET_BANDWIDTH_value_min (struct GNUNET_BANDWIDTH_Value32NBO b1,
-                            struct GNUNET_BANDWIDTH_Value32NBO b2)
+                            struct GNUNET_BANDWIDTH_Value32NBO b2)
 {
   return GNUNET_BANDWIDTH_value_init (GNUNET_MIN (ntohl (b1.value__),
-                                                  ntohl (b2.value__)));
+                                                  ntohl (b2.value__)));
 }
 
 
@@ -74,18 +74,20 @@ GNUNET_BANDWIDTH_value_min (struct GNUNET_BANDWIDTH_Value32NBO b1,
  * @param deadline when is the deadline
  * @return number of bytes available at bps until deadline
  */
-uint64_t 
-GNUNET_BANDWIDTH_value_get_available_until (struct GNUNET_BANDWIDTH_Value32NBO bps,
-                                            struct GNUNET_TIME_Relative deadline)
+uint64_t
+GNUNET_BANDWIDTH_value_get_available_until (struct GNUNET_BANDWIDTH_Value32NBO
+                                            bps,
+                                            struct GNUNET_TIME_Relative
+                                            deadline)
 {
   uint64_t b;
 
   b = ntohl (bps.value__);
 #if DEBUG_BANDWIDTH
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Bandwidth has %llu bytes available until deadline in %llums\n",
-              (unsigned long long) ((b * deadline.rel_value + 500LL) / 1000LL),
-              deadline.rel_value);
+              "Bandwidth has %llu bytes available until deadline in %llums\n",
+              (unsigned long long) ((b * deadline.rel_value + 500LL) / 1000LL),
+              deadline.rel_value);
 #endif
   return (b * deadline.rel_value + 500LL) / 1000LL;
 }
@@ -101,26 +103,25 @@ GNUNET_BANDWIDTH_value_get_available_until (struct GNUNET_BANDWIDTH_Value32NBO b
  */
 struct GNUNET_TIME_Relative
 GNUNET_BANDWIDTH_value_get_delay_for (struct GNUNET_BANDWIDTH_Value32NBO bps,
-                                      uint64_t size)
+                                      uint64_t size)
 {
   uint64_t b;
   struct GNUNET_TIME_Relative ret;
 
   b = ntohl (bps.value__);
   if (b == 0)
-    {
+  {
 #if DEBUG_BANDWIDTH
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Bandwidth suggests delay of infinity (zero bandwidth)\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Bandwidth suggests delay of infinity (zero bandwidth)\n");
 #endif
-      return GNUNET_TIME_UNIT_FOREVER_REL;
-    }
+    return GNUNET_TIME_UNIT_FOREVER_REL;
+  }
   ret.rel_value = size * 1000LL / b;
 #if DEBUG_BANDWIDTH
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Bandwidth suggests delay of %llu ms for %llu bytes of traffic\n",
-              (unsigned long long) ret.rel_value,
-              (unsigned long long) size);
+              "Bandwidth suggests delay of %llu ms for %llu bytes of traffic\n",
+              (unsigned long long) ret.rel_value, (unsigned long long) size);
 #endif
   return ret;
 }
@@ -142,8 +143,8 @@ GNUNET_BANDWIDTH_value_get_delay_for (struct GNUNET_BANDWIDTH_Value32NBO bps,
  */
 void
 GNUNET_BANDWIDTH_tracker_init (struct GNUNET_BANDWIDTH_Tracker *av,
-                               struct GNUNET_BANDWIDTH_Value32NBO bytes_per_second_limit,
-                               uint32_t max_carry_s)
+                               struct GNUNET_BANDWIDTH_Value32NBO
+                               bytes_per_second_limit, uint32_t max_carry_s)
 {
   av->consumption_since_last_update__ = 0;
   av->last_update__ = GNUNET_TIME_absolute_get ();
@@ -151,10 +152,10 @@ GNUNET_BANDWIDTH_tracker_init (struct GNUNET_BANDWIDTH_Tracker *av,
   av->max_carry_s__ = max_carry_s;
 #if DEBUG_BANDWIDTH
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Tracker %p initialized with %u Bps and max carry %u\n",
-              av,
-              (unsigned int) av->available_bytes_per_s__,
-              (unsigned int) max_carry_s);
+              "Tracker %p initialized with %u Bps and max carry %u\n",
+              av,
+              (unsigned int) av->available_bytes_per_s__,
+              (unsigned int) max_carry_s);
 #endif
 }
 
@@ -176,26 +177,28 @@ update_tracker (struct GNUNET_BANDWIDTH_Tracker *av)
 
   now = GNUNET_TIME_absolute_get ();
   delta_time = now.abs_value - av->last_update__.abs_value;
-  delta_avail = (delta_time * ((unsigned long long) av->available_bytes_per_s__) + 500LL) / 1000LL;
+  delta_avail =
+      (delta_time * ((unsigned long long) av->available_bytes_per_s__) +
+       500LL) / 1000LL;
   av->consumption_since_last_update__ -= delta_avail;
   av->last_update__ = now;
   if (av->consumption_since_last_update__ < 0)
-    {
-      left_bytes = - av->consumption_since_last_update__;
-      max_carry = av->available_bytes_per_s__ * av->max_carry_s__;
-      if (max_carry < GNUNET_SERVER_MAX_MESSAGE_SIZE)
-          max_carry = GNUNET_SERVER_MAX_MESSAGE_SIZE;
-      if (max_carry > left_bytes)
-         av->consumption_since_last_update__ = -left_bytes;
-      else
-         av->consumption_since_last_update__ = -max_carry;
-    }
+  {
+    left_bytes = -av->consumption_since_last_update__;
+    max_carry = av->available_bytes_per_s__ * av->max_carry_s__;
+    if (max_carry < GNUNET_SERVER_MAX_MESSAGE_SIZE)
+      max_carry = GNUNET_SERVER_MAX_MESSAGE_SIZE;
+    if (max_carry > left_bytes)
+      av->consumption_since_last_update__ = -left_bytes;
+    else
+      av->consumption_since_last_update__ = -max_carry;
+  }
 #if DEBUG_BANDWIDTH
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Tracker %p  updated, have %u Bps, last update was %llu ms ago\n",
-              av,
-              (unsigned int) av->available_bytes_per_s__,
-              (unsigned long long) delta_time);
+              "Tracker %p  updated, have %u Bps, last update was %llu ms ago\n",
+              av,
+              (unsigned int) av->available_bytes_per_s__,
+              (unsigned long long) delta_time);
 #endif
 
 }
@@ -214,41 +217,38 @@ update_tracker (struct GNUNET_BANDWIDTH_Tracker *av)
  */
 int
 GNUNET_BANDWIDTH_tracker_consume (struct GNUNET_BANDWIDTH_Tracker *av,
-                                  ssize_t size)
+                                  ssize_t size)
 {
   int64_t nc;
 
 #if DEBUG_BANDWIDTH
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Tracker %p consumes %d bytes\n",
-              av,
-              (int) size);
+              "Tracker %p consumes %d bytes\n", av, (int) size);
 #endif
   if (size > 0)
+  {
+    nc = av->consumption_since_last_update__ + size;
+    if (nc < av->consumption_since_last_update__)
+    {
+      GNUNET_break (0);
+      return GNUNET_SYSERR;
+    }
+    av->consumption_since_last_update__ = nc;
+    update_tracker (av);
+    if (av->consumption_since_last_update__ > 0)
     {
-      nc = av->consumption_since_last_update__ + size;
-      if (nc < av->consumption_since_last_update__) 
-        {
-          GNUNET_break (0);
-          return GNUNET_SYSERR;
-        }
-      av->consumption_since_last_update__ = nc;
-      update_tracker (av);
-      if (av->consumption_since_last_update__ > 0)
-        {
 #if DEBUG_BANDWIDTH
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "Tracker %p consumption %llu bytes above limit\n",
-                      av,
-                      (unsigned long long) av->consumption_since_last_update__);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Tracker %p consumption %llu bytes above limit\n",
+                  av, (unsigned long long) av->consumption_since_last_update__);
 #endif
-          return GNUNET_YES;
-        }
+      return GNUNET_YES;
     }
+  }
   else
-    {
-      av->consumption_since_last_update__ += size;
-    }
+  {
+    av->consumption_since_last_update__ += size;
+  }
   return GNUNET_NO;
 }
 
@@ -264,39 +264,35 @@ GNUNET_BANDWIDTH_tracker_consume (struct GNUNET_BANDWIDTH_Tracker *av,
  */
 struct GNUNET_TIME_Relative
 GNUNET_BANDWIDTH_tracker_get_delay (struct GNUNET_BANDWIDTH_Tracker *av,
-                                    size_t size)
+                                    size_t size)
 {
   struct GNUNET_TIME_Relative ret;
   int64_t bytes_needed;
 
   if (av->available_bytes_per_s__ == 0)
-    {
+  {
 #if DEBUG_BANDWIDTH
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Tracker %p delay is infinity\n",
-                  av);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Tracker %p delay is infinity\n", av);
 #endif
-      return GNUNET_TIME_UNIT_FOREVER_REL;
-    }
+    return GNUNET_TIME_UNIT_FOREVER_REL;
+  }
   update_tracker (av);
   bytes_needed = size + av->consumption_since_last_update__;
   if (bytes_needed <= 0)
-    {
+  {
 #if DEBUG_BANDWIDTH
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Tracker %p delay for %u bytes is zero\n",
-                  av,
-                  (unsigned int) size);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Tracker %p delay for %u bytes is zero\n",
+                av, (unsigned int) size);
 #endif
-      return GNUNET_TIME_UNIT_ZERO;
-    }
-  ret.rel_value = 1000LL * bytes_needed / (unsigned long long) av->available_bytes_per_s__;
+    return GNUNET_TIME_UNIT_ZERO;
+  }
+  ret.rel_value =
+      1000LL * bytes_needed / (unsigned long long) av->available_bytes_per_s__;
 #if DEBUG_BANDWIDTH
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Tracker %p delay for %u bytes is %llu ms\n",
-              av,
-              (unsigned int) size,
-              (unsigned long long) ret.rel_value);
+              "Tracker %p delay for %u bytes is %llu ms\n",
+              av, (unsigned int) size, (unsigned long long) ret.rel_value);
 #endif
   return ret;
 }
@@ -309,8 +305,8 @@ GNUNET_BANDWIDTH_tracker_get_delay (struct GNUNET_BANDWIDTH_Tracker *av,
  * @param av tracker to query
  * @return number of bytes available for consumption right now
  */
-int64_t 
-GNUNET_BANDWIDTH_tracker_get_available (struct GNUNET_BANDWIDTH_Tracker *av)
+int64_t
+GNUNET_BANDWIDTH_tracker_get_available (struct GNUNET_BANDWIDTH_Tracker * av)
 {
   struct GNUNET_BANDWIDTH_Value32NBO bps;
   uint64_t avail;
@@ -319,13 +315,13 @@ GNUNET_BANDWIDTH_tracker_get_available (struct GNUNET_BANDWIDTH_Tracker *av)
   update_tracker (av);
   bps = GNUNET_BANDWIDTH_value_init (av->available_bytes_per_s__);
   avail = GNUNET_BANDWIDTH_value_get_available_until (bps,
-                                                      GNUNET_TIME_absolute_get_duration (av->last_update__));
+                                                      GNUNET_TIME_absolute_get_duration
+                                                      (av->last_update__));
   used = av->consumption_since_last_update__;
 #if DEBUG_BANDWIDTH
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Tracker %p  available bandwidth is %lld bytes\n",
-              av,             
-              (long long) (int64_t) (avail - used));
+              "Tracker %p  available bandwidth is %lld bytes\n",
+              av, (long long) (int64_t) (avail - used));
 #endif
   return (int64_t) (avail - used);
 }
@@ -339,7 +335,8 @@ GNUNET_BANDWIDTH_tracker_get_available (struct GNUNET_BANDWIDTH_Tracker *av)
  */
 void
 GNUNET_BANDWIDTH_tracker_update_quota (struct GNUNET_BANDWIDTH_Tracker *av,
-                                       struct GNUNET_BANDWIDTH_Value32NBO bytes_per_second_limit)
+                                       struct GNUNET_BANDWIDTH_Value32NBO
+                                       bytes_per_second_limit)
 {
   uint32_t old_limit;
   uint32_t new_limit;
@@ -347,15 +344,14 @@ GNUNET_BANDWIDTH_tracker_update_quota (struct GNUNET_BANDWIDTH_Tracker *av,
   new_limit = ntohl (bytes_per_second_limit.value__);
 #if DEBUG_BANDWIDTH
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Tracker %p bandwidth changed to %u Bps\n",
-              av,             
-              (unsigned int) new_limit);
+              "Tracker %p bandwidth changed to %u Bps\n",
+              av, (unsigned int) new_limit);
 #endif
   update_tracker (av);
   old_limit = av->available_bytes_per_s__;
   av->available_bytes_per_s__ = new_limit;
   if (old_limit > new_limit)
-    update_tracker (av); /* maximum excess might be less now */
+    update_tracker (av);        /* maximum excess might be less now */
 }