aboutsummaryrefslogtreecommitdiff
path: root/src/util/bandwidth.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-15 21:54:06 +0000
commit5746309cb4be2073d550ad7a6885e918631dbc38 (patch)
tree89455bc4aadf977816b38df13f990372cd81d71a /src/util/bandwidth.c
parent6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff)
downloadgnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz
gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip
indentation
Diffstat (limited to 'src/util/bandwidth.c')
-rw-r--r--src/util/bandwidth.c45
1 files changed, 22 insertions, 23 deletions
diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c
index d138ffba1..95ff4bfff 100644
--- a/src/util/bandwidth.c
+++ b/src/util/bandwidth.c
@@ -41,8 +41,7 @@ GNUNET_BANDWIDTH_value_init (uint32_t bytes_per_second)
41 struct GNUNET_BANDWIDTH_Value32NBO ret; 41 struct GNUNET_BANDWIDTH_Value32NBO ret;
42 42
43#if DEBUG_BANDWIDTH 43#if DEBUG_BANDWIDTH
44 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 44 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Initializing bandwidth of %u Bps\n",
45 "Initializing bandwidth of %u Bps\n",
46 (unsigned int) bytes_per_second); 45 (unsigned int) bytes_per_second);
47#endif 46#endif
48 ret.value__ = htonl (bytes_per_second); 47 ret.value__ = htonl (bytes_per_second);
@@ -61,8 +60,9 @@ struct GNUNET_BANDWIDTH_Value32NBO
61GNUNET_BANDWIDTH_value_min (struct GNUNET_BANDWIDTH_Value32NBO b1, 60GNUNET_BANDWIDTH_value_min (struct GNUNET_BANDWIDTH_Value32NBO b1,
62 struct GNUNET_BANDWIDTH_Value32NBO b2) 61 struct GNUNET_BANDWIDTH_Value32NBO b2)
63{ 62{
64 return GNUNET_BANDWIDTH_value_init (GNUNET_MIN (ntohl (b1.value__), 63 return
65 ntohl (b2.value__))); 64 GNUNET_BANDWIDTH_value_init (GNUNET_MIN
65 (ntohl (b1.value__), ntohl (b2.value__)));
66} 66}
67 67
68 68
@@ -152,8 +152,7 @@ GNUNET_BANDWIDTH_tracker_init (struct GNUNET_BANDWIDTH_Tracker *av,
152 av->max_carry_s__ = max_carry_s; 152 av->max_carry_s__ = max_carry_s;
153#if DEBUG_BANDWIDTH 153#if DEBUG_BANDWIDTH
154 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 154 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
155 "Tracker %p initialized with %u Bps and max carry %u\n", 155 "Tracker %p initialized with %u Bps and max carry %u\n", av,
156 av,
157 (unsigned int) av->available_bytes_per_s__, 156 (unsigned int) av->available_bytes_per_s__,
158 (unsigned int) max_carry_s); 157 (unsigned int) max_carry_s);
159#endif 158#endif
@@ -196,8 +195,7 @@ update_tracker (struct GNUNET_BANDWIDTH_Tracker *av)
196#if DEBUG_BANDWIDTH 195#if DEBUG_BANDWIDTH
197 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 196 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
198 "Tracker %p updated, have %u Bps, last update was %llu ms ago\n", 197 "Tracker %p updated, have %u Bps, last update was %llu ms ago\n",
199 av, 198 av, (unsigned int) av->available_bytes_per_s__,
200 (unsigned int) av->available_bytes_per_s__,
201 (unsigned long long) delta_time); 199 (unsigned long long) delta_time);
202#endif 200#endif
203 201
@@ -222,8 +220,8 @@ GNUNET_BANDWIDTH_tracker_consume (struct GNUNET_BANDWIDTH_Tracker *av,
222 int64_t nc; 220 int64_t nc;
223 221
224#if DEBUG_BANDWIDTH 222#if DEBUG_BANDWIDTH
225 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 223 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Tracker %p consumes %d bytes\n", av,
226 "Tracker %p consumes %d bytes\n", av, (int) size); 224 (int) size);
227#endif 225#endif
228 if (size > 0) 226 if (size > 0)
229 { 227 {
@@ -239,8 +237,8 @@ GNUNET_BANDWIDTH_tracker_consume (struct GNUNET_BANDWIDTH_Tracker *av,
239 { 237 {
240#if DEBUG_BANDWIDTH 238#if DEBUG_BANDWIDTH
241 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 239 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
242 "Tracker %p consumption %llu bytes above limit\n", 240 "Tracker %p consumption %llu bytes above limit\n", av,
243 av, (unsigned long long) av->consumption_since_last_update__); 241 (unsigned long long) av->consumption_since_last_update__);
244#endif 242#endif
245 return GNUNET_YES; 243 return GNUNET_YES;
246 } 244 }
@@ -282,8 +280,8 @@ GNUNET_BANDWIDTH_tracker_get_delay (struct GNUNET_BANDWIDTH_Tracker *av,
282 { 280 {
283#if DEBUG_BANDWIDTH 281#if DEBUG_BANDWIDTH
284 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 282 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
285 "Tracker %p delay for %u bytes is zero\n", 283 "Tracker %p delay for %u bytes is zero\n", av,
286 av, (unsigned int) size); 284 (unsigned int) size);
287#endif 285#endif
288 return GNUNET_TIME_UNIT_ZERO; 286 return GNUNET_TIME_UNIT_ZERO;
289 } 287 }
@@ -291,8 +289,8 @@ GNUNET_BANDWIDTH_tracker_get_delay (struct GNUNET_BANDWIDTH_Tracker *av,
291 1000LL * bytes_needed / (unsigned long long) av->available_bytes_per_s__; 289 1000LL * bytes_needed / (unsigned long long) av->available_bytes_per_s__;
292#if DEBUG_BANDWIDTH 290#if DEBUG_BANDWIDTH
293 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 291 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
294 "Tracker %p delay for %u bytes is %llu ms\n", 292 "Tracker %p delay for %u bytes is %llu ms\n", av,
295 av, (unsigned int) size, (unsigned long long) ret.rel_value); 293 (unsigned int) size, (unsigned long long) ret.rel_value);
296#endif 294#endif
297 return ret; 295 return ret;
298} 296}
@@ -314,14 +312,15 @@ GNUNET_BANDWIDTH_tracker_get_available (struct GNUNET_BANDWIDTH_Tracker * av)
314 312
315 update_tracker (av); 313 update_tracker (av);
316 bps = GNUNET_BANDWIDTH_value_init (av->available_bytes_per_s__); 314 bps = GNUNET_BANDWIDTH_value_init (av->available_bytes_per_s__);
317 avail = GNUNET_BANDWIDTH_value_get_available_until (bps, 315 avail =
318 GNUNET_TIME_absolute_get_duration 316 GNUNET_BANDWIDTH_value_get_available_until (bps,
319 (av->last_update__)); 317 GNUNET_TIME_absolute_get_duration
318 (av->last_update__));
320 used = av->consumption_since_last_update__; 319 used = av->consumption_since_last_update__;
321#if DEBUG_BANDWIDTH 320#if DEBUG_BANDWIDTH
322 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 321 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
323 "Tracker %p available bandwidth is %lld bytes\n", 322 "Tracker %p available bandwidth is %lld bytes\n", av,
324 av, (long long) (int64_t) (avail - used)); 323 (long long) (int64_t) (avail - used));
325#endif 324#endif
326 return (int64_t) (avail - used); 325 return (int64_t) (avail - used);
327} 326}
@@ -344,8 +343,8 @@ GNUNET_BANDWIDTH_tracker_update_quota (struct GNUNET_BANDWIDTH_Tracker *av,
344 new_limit = ntohl (bytes_per_second_limit.value__); 343 new_limit = ntohl (bytes_per_second_limit.value__);
345#if DEBUG_BANDWIDTH 344#if DEBUG_BANDWIDTH
346 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 345 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
347 "Tracker %p bandwidth changed to %u Bps\n", 346 "Tracker %p bandwidth changed to %u Bps\n", av,
348 av, (unsigned int) new_limit); 347 (unsigned int) new_limit);
349#endif 348#endif
350 update_tracker (av); 349 update_tracker (av);
351 old_limit = av->available_bytes_per_s__; 350 old_limit = av->available_bytes_per_s__;