mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: poll: fix abnormally high skip_fd counter

Browse Source 
The skip_fd counter that is incremented when a migrated FD is reported
was abnormally high in with poll. The reason is that it was accounted
for before preparing the polled events instead of being measured from
the reported events.

This mistake was done when the counters were introduced in 1.9 with
commit d80cb4ee1 ("MINOR: global: add some global activity counters to
help debugging"). It may be backported as far as 2.0.
This commit is contained in:
Willy Tarreau 2021-07-30 14:04:28 +02:00
parent fcc5281513
commit 177119bb11
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ev_poll.c
View File

@ -188,7 +188,6 @@ static void _do_poll(struct poller *p, int exp, int wake)
}
if (!(fdtab[fd].thread_mask & tid_bit)) {
activity[tid].poll_skip_fd++;
continue;
}
@ -233,6 +232,11 @@ static void _do_poll(struct poller *p, int exp, int wake)
continue;
}
if (!(fdtab[fd].thread_mask & tid_bit)) {
activity[tid].poll_skip_fd++;
continue;
}
n = ((e & POLLIN) ? FD_EV_READY_R : 0) |
((e & POLLOUT) ? FD_EV_READY_W : 0) |
((e & POLLRDHUP) ? FD_EV_SHUT_R : 0) |