X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fbandwidth.c;h=6f25abfd523bc23870c59a14a1734adf7c9e6162;hb=46ac0cea02fe1949d76b86c7a0750f9e7854fef6;hp=71701a84cb0ff42cdcebca9f3156619c50577d2a;hpb=09aa8d7653e9b0aee611ba685cc153598b42698b;p=oweals%2Fgnunet.git diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c index 71701a84c..6f25abfd5 100644 --- a/src/util/bandwidth.c +++ b/src/util/bandwidth.c @@ -42,7 +42,7 @@ GNUNET_BANDWIDTH_value_init (uint32_t bytes_per_second) #if DEBUG_BANDWIDTH GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Initializing bandwidth of %u bps\n", + "Initializing bandwidth of %u Bps\n", (unsigned int) bytes_per_second); #endif ret.value__ = htonl (bytes_per_second); @@ -84,10 +84,10 @@ GNUNET_BANDWIDTH_value_get_available_until (struct GNUNET_BANDWIDTH_Value32NBO b #if DEBUG_BANDWIDTH GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Bandwidth has %llu bytes available until deadline in %llums\n", - (unsigned long long) ((b * deadline.value + 500LL) / 1000LL), - deadline.value); + (unsigned long long) ((b * deadline.rel_value + 500LL) / 1000LL), + deadline.rel_value); #endif - return (b * deadline.value + 500LL) / 1000LL; + return (b * deadline.rel_value + 500LL) / 1000LL; } @@ -115,11 +115,11 @@ GNUNET_BANDWIDTH_value_get_delay_for (struct GNUNET_BANDWIDTH_Value32NBO bps, #endif return GNUNET_TIME_UNIT_FOREVER_REL; } - ret.value = size * 1000LL / b; + 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.value, + (unsigned long long) ret.rel_value, (unsigned long long) size); #endif return ret; @@ -151,7 +151,7 @@ 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", + "Tracker %p initialized with %u Bps and max carry %u\n", av, (unsigned int) av->available_bytes_per_s__, (unsigned int) max_carry_s); @@ -169,54 +169,35 @@ static void 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_time = now.abs_value - av->last_update__.abs_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; - } - } - } + 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 - { - left_time_ms = 0; - } - av->consumption_since_last_update__ = 0; - av->last_update__.value = now.value - left_time_ms; + 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", + "Tracker %p updated, have %u Bps, last update was %llu ms ago\n", av, (unsigned int) av->available_bytes_per_s__, - (unsigned long long) (now.value - av->last_update__.value)); + (unsigned long long) delta_time); #endif + } @@ -235,7 +216,7 @@ int 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, @@ -266,8 +247,7 @@ GNUNET_BANDWIDTH_tracker_consume (struct GNUNET_BANDWIDTH_Tracker *av, } 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; } @@ -280,17 +260,14 @@ GNUNET_BANDWIDTH_tracker_consume (struct GNUNET_BANDWIDTH_Tracker *av, * * @param av tracker to query * @param size number of bytes we would like to consume - * @return time to wait for consumption to be OK + * @return time in ms to wait for consumption to be OK */ struct GNUNET_TIME_Relative GNUNET_BANDWIDTH_tracker_get_delay (struct GNUNET_BANDWIDTH_Tracker *av, 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) { @@ -302,10 +279,8 @@ GNUNET_BANDWIDTH_tracker_get_delay (struct GNUNET_BANDWIDTH_Tracker *av, 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, @@ -315,14 +290,13 @@ GNUNET_BANDWIDTH_tracker_get_delay (struct GNUNET_BANDWIDTH_Tracker *av, #endif return GNUNET_TIME_UNIT_ZERO; } - bytes_needed = size - delta_avail; - ret.value = 1000LL * bytes_needed / (unsigned long long) av->available_bytes_per_s__; + 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.value); + (unsigned long long) ret.rel_value); #endif return ret; } @@ -340,7 +314,7 @@ GNUNET_BANDWIDTH_tracker_get_available (struct GNUNET_BANDWIDTH_Tracker *av) { 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__); @@ -349,7 +323,7 @@ GNUNET_BANDWIDTH_tracker_get_available (struct GNUNET_BANDWIDTH_Tracker *av) used = av->consumption_since_last_update__; #if DEBUG_BANDWIDTH GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Tracker %p available bandwith is %lld ms\n", + "Tracker %p available bandwidth is %lld bytes\n", av, (long long) (int64_t) (avail - used)); #endif @@ -373,7 +347,7 @@ 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 bandwith changed to %u bps\n", + "Tracker %p bandwidth changed to %u Bps\n", av, (unsigned int) new_limit); #endif