X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftally%2Ftally.c;h=52bd4e11b903b661360390bd1c96dc34a875ed2b;hp=7eec70d39323429e259e08f04d195fd97472f57b;hb=cee0f8b2e90d19e60a040df3c611516719be7225;hpb=4f438157901f6784cd47135e50deb204fc0c230b diff --git a/ccan/tally/tally.c b/ccan/tally/tally.c index 7eec70d3..52bd4e11 100644 --- a/ccan/tally/tally.c +++ b/ccan/tally/tally.c @@ -63,8 +63,9 @@ static unsigned bucket_of(ssize_t min, unsigned step_bits, ssize_t val) static ssize_t bucket_min(ssize_t min, unsigned step_bits, unsigned b) { /* Don't over-shift. */ - if (step_bits == SIZET_BITS) + if (step_bits == SIZET_BITS) { return min; + } assert(step_bits < SIZET_BITS); return min + ((ssize_t)b << step_bits); } @@ -72,8 +73,9 @@ static ssize_t bucket_min(ssize_t min, unsigned step_bits, unsigned b) /* Does shifting by this many bits truncate the number? */ static bool shift_overflows(size_t num, unsigned bits) { - if (bits == 0) + if (bits == 0) { return false; + } return ((num << bits) >> 1) != (num << (bits - 1)); } @@ -86,8 +88,9 @@ static void renormalize(struct tally *tally, unsigned int i, old_min; /* Uninitialized? Don't do anything... */ - if (tally->max < tally->min) + if (tally->max < tally->min) { goto update; + } /* If we don't have sufficient range, increase step bits until * buckets cover entire range of ssize_t anyway. */ @@ -135,15 +138,17 @@ void tally_add(struct tally *tally, ssize_t val) new_max = val; need_renormalize = true; } - if (need_renormalize) + if (need_renormalize) { renormalize(tally, new_min, new_max); + } /* 128-bit arithmetic! If we didn't want exact mean, we could just * pull it out of counts. */ - if (val > 0 && tally->total[0] + val < tally->total[0]) + if (val > 0 && tally->total[0] + val < tally->total[0]) { tally->total[1]++; - else if (val < 0 && tally->total[0] + val > tally->total[0]) + } else if (val < 0 && tally->total[0] + val > tally->total[0]) { tally->total[1]--; + } tally->total[0] += val; tally->counts[bucket_of(tally->min, tally->step_bits, val)]++; } @@ -151,8 +156,9 @@ void tally_add(struct tally *tally, ssize_t val) size_t tally_num(const struct tally *tally) { size_t i, num = 0; - for (i = 0; i < tally->buckets; i++) + for (i = 0; i < tally->buckets; i++) { num += tally->counts[i]; + } return num; }