use putenv instead of setenv for portability

[oweals/gnunet.git] / src / util / bandwidth.c

diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c
index 95ff4bfffa559a3f7b035050d53a62a028e4f784..0920362f5a529c0cda8f1da732aa738f863656b4 100644 (file)
--- a/src/util/bandwidth.c
+++ b/src/util/bandwidth.c
@@ -20,14 +20,16 @@
 
 /**
  * @file util/bandwidth.c
- * @brief functions related to bandwidth (unit) 
+ * @brief functions related to bandwidth (unit)
  * @author Christian Grothoff
  */
 #include "platform.h"
 #include "gnunet_bandwidth_lib.h"
 #include "gnunet_server_lib.h"
 
-#define DEBUG_BANDWIDTH GNUNET_NO
+#define DEBUG_BANDWIDTH GNUNET_EXTRA_LOGGING
+
+#define LOG(kind,...) GNUNET_log_from (kind, "util",__VA_ARGS__)
 
 /**
  * Create a new bandwidth value.
@@ -41,8 +43,8 @@ GNUNET_BANDWIDTH_value_init (uint32_t bytes_per_second)
   struct GNUNET_BANDWIDTH_Value32NBO ret;
 
 #if DEBUG_BANDWIDTH
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Initializing bandwidth of %u Bps\n",
-              (unsigned int) bytes_per_second);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Initializing bandwidth of %u Bps\n",
+       (unsigned int) bytes_per_second);
 #endif
   ret.value__ = htonl (bytes_per_second);
   return ret;
@@ -84,10 +86,10 @@ GNUNET_BANDWIDTH_value_get_available_until (struct GNUNET_BANDWIDTH_Value32NBO
 
   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);
+  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);
 #endif
   return (b * deadline.rel_value + 500LL) / 1000LL;
 }
@@ -112,16 +114,16 @@ GNUNET_BANDWIDTH_value_get_delay_for (struct GNUNET_BANDWIDTH_Value32NBO bps,
   if (b == 0)
   {
 #if DEBUG_BANDWIDTH
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Bandwidth suggests delay of infinity (zero bandwidth)\n");
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Bandwidth suggests delay of infinity (zero bandwidth)\n");
 #endif
     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);
+  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);
 #endif
   return ret;
 }
@@ -151,10 +153,9 @@ GNUNET_BANDWIDTH_tracker_init (struct GNUNET_BANDWIDTH_Tracker *av,
   av->available_bytes_per_s__ = ntohl (bytes_per_second_limit.value__);
   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);
+  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);
 #endif
 }
 
@@ -193,10 +194,10 @@ update_tracker (struct GNUNET_BANDWIDTH_Tracker *av)
       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);
+  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);
 #endif
 
 }
@@ -220,8 +221,8 @@ GNUNET_BANDWIDTH_tracker_consume (struct GNUNET_BANDWIDTH_Tracker *av,
   int64_t nc;
 
 #if DEBUG_BANDWIDTH
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Tracker %p consumes %d bytes\n", av,
-              (int) size);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Tracker %p consumes %d bytes\n", av,
+       (int) size);
 #endif
   if (size > 0)
   {
@@ -236,9 +237,9 @@ GNUNET_BANDWIDTH_tracker_consume (struct GNUNET_BANDWIDTH_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__);
+      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;
     }
@@ -270,7 +271,7 @@ GNUNET_BANDWIDTH_tracker_get_delay (struct GNUNET_BANDWIDTH_Tracker *av,
   if (av->available_bytes_per_s__ == 0)
   {
 #if DEBUG_BANDWIDTH
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Tracker %p delay is infinity\n", av);
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "Tracker %p delay is infinity\n", av);
 #endif
     return GNUNET_TIME_UNIT_FOREVER_REL;
   }
@@ -279,18 +280,17 @@ GNUNET_BANDWIDTH_tracker_get_delay (struct GNUNET_BANDWIDTH_Tracker *av,
   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);
+    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__;
+      (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);
+  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);
 #endif
   return ret;
 }
@@ -318,9 +318,9 @@ GNUNET_BANDWIDTH_tracker_get_available (struct GNUNET_BANDWIDTH_Tracker * av)
                                                   (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));
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "Tracker %p  available bandwidth is %lld bytes\n", av,
+       (long long) (int64_t) (avail - used));
 #endif
   return (int64_t) (avail - used);
 }
@@ -342,9 +342,8 @@ 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);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Tracker %p bandwidth changed to %u Bps\n", av,
+       (unsigned int) new_limit);
 #endif
   update_tracker (av);
   old_limit = av->available_bytes_per_s__;