Correct r335242. Use unsigned cast instead of abs(). Using abs() gives

incorrect result when ticks has already wrapped, and are about to reach
the cr_ticks value (cr_ticks - ticks < hz).

Submitted by:	bde
This commit is contained in:
Gleb Smirnoff 2018-06-27 22:00:50 +00:00
parent 4e2a44900d
commit 95dce07dea
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=335748

View File

@ -140,7 +140,7 @@ counter_ratecheck(struct counter_rate *cr, int64_t limit)
val = cr->cr_over;
now = ticks;
if (abs(now - cr->cr_ticks) >= hz) {
if ((u_int)(now - cr->cr_ticks) >= hz) {
/*
* Time to clear the structure, we are in the next second.
* First try unlocked read, and then proceed with atomic.
@ -151,7 +151,7 @@ counter_ratecheck(struct counter_rate *cr, int64_t limit)
* Check if other thread has just went through the
* reset sequence before us.
*/
if (abs(now - cr->cr_ticks) >= hz) {
if ((u_int)(now - cr->cr_ticks) >= hz) {
val = counter_u64_fetch(cr->cr_rate);
counter_u64_zero(cr->cr_rate);
cr->cr_over = 0;