X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftally%2Ftally.c;h=4e8876cc4aa5e2874fa83c1b341783e9811d0927;hp=1c471c1503ec51ff57177db1d71d0ffaa5019455;hb=bf7539ac82df33522461561b4940600ae41c6e55;hpb=7851faa626656f37ffd2b4b5e70139403c8d3235 diff --git a/ccan/tally/tally.c b/ccan/tally/tally.c index 1c471c15..4e8876cc 100644 --- a/ccan/tally/tally.c +++ b/ccan/tally/tally.c @@ -73,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)); } @@ -87,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. */ @@ -136,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)]++; } @@ -152,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; } @@ -178,8 +183,9 @@ static unsigned fls64(uint64_t val) #endif uint64_t r = 64; - if (!val) + if (!val) { return 0; + } if (!(val & 0xffffffff00000000ull)) { val <<= 32; r -= 32;