update_tracker (struct GNUNET_BANDWIDTH_Tracker *av)
{
struct GNUNET_TIME_Absolute now;
- uint64_t avail_per_ms;
uint64_t delta_time;
uint64_t delta_avail;
uint64_t left_bytes;
- uint64_t left_time_ms;
+ uint64_t max_carry;
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 (av->consumption_since_last_update__ >= delta_avail)
+ av->consumption_since_last_update__ -= delta_avail;
+ av->last_update__ = now;
+ if (av->consumption_since_last_update__ < 0)
{
- av->consumption_since_last_update__ -= delta_avail;
- av->last_update__ = now;
- }
- else
- {
- left_bytes = delta_avail - av->consumption_since_last_update__;
- avail_per_ms = ((unsigned long long) av->available_bytes_per_s__ + 500LL) / 1000LL;
- if (avail_per_ms > 0)
- {
- left_time_ms = left_bytes / avail_per_ms;
- if (left_time_ms > ((unsigned long long) av->max_carry_s__) * 1000LL)
- {
- /* need to limit accumulation of unused bandwidth */
- left_time_ms = ((unsigned long long) av->max_carry_s__) * 1000LL;
- if (left_time_ms * avail_per_ms < GNUNET_SERVER_MAX_MESSAGE_SIZE)
- {
- /* need to still allow GNUNET_SERVER_MAX_MESSAGE_SIZE accumulation */
- if (left_bytes > GNUNET_SERVER_MAX_MESSAGE_SIZE)
- left_bytes = GNUNET_SERVER_MAX_MESSAGE_SIZE;
- left_time_ms = left_bytes / avail_per_ms;
- }
- }
- }
- else
- {
- left_time_ms = 0;
- }
- av->consumption_since_last_update__ = 0;
- av->last_update__.value = now.value - left_time_ms;
+ left_bytes = - av->consumption_since_last_update__;
+ max_carry = av->available_bytes_per_s__ * av->max_carry_s__;
+ if (max_carry > left_bytes)
+ av->consumption_since_last_update__ = -max_carry;
}
#if DEBUG_BANDWIDTH
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
GNUNET_BANDWIDTH_tracker_consume (struct GNUNET_BANDWIDTH_Tracker *av,
ssize_t size)
{
- uint64_t nc;
+ int64_t nc;
#if DEBUG_BANDWIDTH
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
}
else
{
- av->last_update__.value -= ((-size) * av->available_bytes_per_s__ + 500LL) / 1000LL;
- update_tracker (av);
+ av->consumption_since_last_update__ += size;
}
return GNUNET_NO;
}
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)
{
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,
#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,
{
struct GNUNET_BANDWIDTH_Value32NBO bps;
uint64_t avail;
- uint64_t used;
+ int64_t used;
update_tracker (av);
bps = GNUNET_BANDWIDTH_value_init (av->available_bytes_per_s__);