[GNUnet-SVN] r11573 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2010-05-31 14:05:31 +0200 (Mon, 31 May 2010)
New Revision: 11573

Modified:
   gnunet/src/util/bandwidth.c
Log:
fix

Modified: gnunet/src/util/bandwidth.c
===================================================================
--- gnunet/src/util/bandwidth.c 2010-05-31 12:02:01 UTC (rev 11572)
+++ gnunet/src/util/bandwidth.c 2010-05-31 12:05:31 UTC (rev 11573)
@@ -262,10 +262,7 @@
                                    size_t size)
 {
   struct GNUNET_TIME_Relative ret;
-  struct GNUNET_TIME_Absolute now;
-  uint64_t delta_avail;
-  uint64_t delta_time;
-  uint64_t bytes_needed;
+  int64_t bytes_needed;
 
   if (av->available_bytes_per_s__ == 0)
     {
@@ -277,10 +274,8 @@
       return GNUNET_TIME_UNIT_FOREVER_REL;
     }
   update_tracker (av);
-  now = GNUNET_TIME_absolute_get ();
-  delta_time = now.value - av->last_update__.value;
-  delta_avail = (delta_time * ((unsigned long long) 
av->available_bytes_per_s__) + 500LL) / 1000LL;
-  if (delta_avail >= size)
+  bytes_needed = size + av->consumption_since_last_update__;
+  if (bytes_needed <= 0)
     {
 #if DEBUG_BANDWIDTH
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -290,7 +285,6 @@
 #endif
       return GNUNET_TIME_UNIT_ZERO;
     }
-  bytes_needed = size - delta_avail;
   ret.value = 1000LL * bytes_needed / (unsigned long long) 
av->available_bytes_per_s__;
 #if DEBUG_BANDWIDTH
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,