RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-01 22:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: time: fix idle time computation for long sleeps

Browse Source 
In 2.4 we extended the max poll time from 1s to 60s with commit
4f59d3861 ("MINOR: time: increase the minimum wakeup interval to 60s").

This had the consequence that the calculation of the idle time percentage
may overflow during the multiply by 100 if the thread had slept 43s or
more. Let's change this to a 64 bit computation. This will have no
performance impact since this is done at most twice per second.

This should fix github issue #1366.

This must be backported to 2.4.
This commit is contained in:
Willy Tarreau 2021-08-27 23:16:58 +02:00
parent 310a260e4a
commit e365aa28d4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/time.h
View File

@ -577,7 +577,7 @@ static inline void measure_idle()
if (samp_time < 500000)
return;
ti->idle_pct = (100 * idle_time + samp_time / 2) / samp_time;
ti->idle_pct = (100ULL * idle_time + samp_time / 2) / samp_time;
idle_time = samp_time = 0;
}