mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-09 16:47:18 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: activity: rename confusing poll_* fields in the output

Browse Source 
We have poll_drop, poll_dead and poll_skip which are confusingly named
like their poll_io and poll_exp counterparts except that they are not
per poll() call but per-fd. This patch renames them to poll_drop_fd(),
poll_dead_fd() and poll_skip_fd() for this reason.
This commit is contained in:
Willy Tarreau 2020-06-17 20:35:33 +02:00
parent e545153c50
commit e406386542
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/haproxy/activity-t.h
View File

@ -42,9 +42,9 @@ struct activity {
unsigned int wake_signal; // pending signal prevented poll() from sleeping unsigned int wake_signal; // pending signal prevented poll() from sleeping
unsigned int poll_io; // number of times poll() reported I/O events unsigned int poll_io; // number of times poll() reported I/O events
unsigned int poll_exp; // number of times poll() sees an expired timeout (includes wake_*) unsigned int poll_exp; // number of times poll() sees an expired timeout (includes wake_*)
unsigned int poll_drop; // poller dropped a dead FD from the update list unsigned int poll_drop_fd; // poller dropped a dead FD from the update list
unsigned int poll_dead; // poller woke up with a dead FD unsigned int poll_dead_fd; // poller woke up with a dead FD
unsigned int poll_skip; // poller skipped another thread's FD unsigned int poll_skip_fd; // poller skipped another thread's FD
unsigned int conn_dead; // conn_fd_handler woke up on an FD indicating a dead connection unsigned int conn_dead; // conn_fd_handler woke up on an FD indicating a dead connection
unsigned int stream; // calls to process_stream() unsigned int stream; // calls to process_stream()
unsigned int ctxsw; // total number of context switches unsigned int ctxsw; // total number of context switches

6
src/cli.c
View File

@ -1131,9 +1131,9 @@ static int cli_io_handler_show_activity(struct appctx *appctx)
chunk_appendf(&trash, "wake_signal:"); SHOW_TOT(thr, activity[thr].wake_signal); chunk_appendf(&trash, "wake_signal:"); SHOW_TOT(thr, activity[thr].wake_signal);
chunk_appendf(&trash, "poll_io:"); SHOW_TOT(thr, activity[thr].poll_io); chunk_appendf(&trash, "poll_io:"); SHOW_TOT(thr, activity[thr].poll_io);
chunk_appendf(&trash, "poll_exp:"); SHOW_TOT(thr, activity[thr].poll_exp); chunk_appendf(&trash, "poll_exp:"); SHOW_TOT(thr, activity[thr].poll_exp);
chunk_appendf(&trash, "poll_drop:"); SHOW_TOT(thr, activity[thr].poll_drop); chunk_appendf(&trash, "poll_drop_fd:"); SHOW_TOT(thr, activity[thr].poll_drop_fd);
chunk_appendf(&trash, "poll_dead:"); SHOW_TOT(thr, activity[thr].poll_dead); chunk_appendf(&trash, "poll_dead_fd:"); SHOW_TOT(thr, activity[thr].poll_dead_fd);
chunk_appendf(&trash, "poll_skip:"); SHOW_TOT(thr, activity[thr].poll_skip); chunk_appendf(&trash, "poll_skip_fd:"); SHOW_TOT(thr, activity[thr].poll_skip_fd);
chunk_appendf(&trash, "conn_dead:"); SHOW_TOT(thr, activity[thr].conn_dead); chunk_appendf(&trash, "conn_dead:"); SHOW_TOT(thr, activity[thr].conn_dead);
chunk_appendf(&trash, "stream:"); SHOW_TOT(thr, activity[thr].stream); chunk_appendf(&trash, "stream:"); SHOW_TOT(thr, activity[thr].stream);
chunk_appendf(&trash, "pool_fail:"); SHOW_TOT(thr, activity[thr].pool_fail); chunk_appendf(&trash, "pool_fail:"); SHOW_TOT(thr, activity[thr].pool_fail);

6
src/ev_epoll.c
View File

@ -142,7 +142,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
_HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit); _HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit);
if (!fdtab[fd].owner) { if (!fdtab[fd].owner) {
activity[tid].poll_drop++; activity[tid].poll_drop_fd++;
continue; continue;
} }
@ -208,13 +208,13 @@ static void _do_poll(struct poller *p, int exp, int wake)
fd = epoll_events[count].data.fd; fd = epoll_events[count].data.fd;
if (!fdtab[fd].owner) { if (!fdtab[fd].owner) {
activity[tid].poll_dead++; activity[tid].poll_dead_fd++;
continue; continue;
} }
if (!(fdtab[fd].thread_mask & tid_bit)) { if (!(fdtab[fd].thread_mask & tid_bit)) {
/* FD has been migrated */ /* FD has been migrated */
activity[tid].poll_skip++; activity[tid].poll_skip_fd++;
epoll_ctl(epoll_fd[tid], EPOLL_CTL_DEL, fd, &ev); epoll_ctl(epoll_fd[tid], EPOLL_CTL_DEL, fd, &ev);
_HA_ATOMIC_AND(&polled_mask[fd].poll_recv, ~tid_bit); _HA_ATOMIC_AND(&polled_mask[fd].poll_recv, ~tid_bit);
_HA_ATOMIC_AND(&polled_mask[fd].poll_send, ~tid_bit); _HA_ATOMIC_AND(&polled_mask[fd].poll_send, ~tid_bit);

6
src/ev_evports.c
View File

@ -125,7 +125,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
_HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit); _HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit);
if (fdtab[fd].owner == NULL) { if (fdtab[fd].owner == NULL) {
activity[tid].poll_drop++; activity[tid].poll_drop_fd++;
continue; continue;
} }
@ -217,12 +217,12 @@ static void _do_poll(struct poller *p, int exp, int wake)
events = evports_evlist[i].portev_events; events = evports_evlist[i].portev_events;
if (fdtab[fd].owner == NULL) { if (fdtab[fd].owner == NULL) {
activity[tid].poll_dead++; activity[tid].poll_dead_fd++;
continue; continue;
} }
if (!(fdtab[fd].thread_mask & tid_bit)) { if (!(fdtab[fd].thread_mask & tid_bit)) {
activity[tid].poll_skip++; activity[tid].poll_skip_fd++;
continue; continue;
} }

6
src/ev_kqueue.c
View File

@ -101,7 +101,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
_HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit); _HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit);
if (!fdtab[fd].owner) { if (!fdtab[fd].owner) {
activity[tid].poll_drop++; activity[tid].poll_drop_fd++;
continue; continue;
} }
changes = _update_fd(fd, changes); changes = _update_fd(fd, changes);
@ -184,12 +184,12 @@ static void _do_poll(struct poller *p, int exp, int wake)
fd = kev[count].ident; fd = kev[count].ident;
if (!fdtab[fd].owner) { if (!fdtab[fd].owner) {
activity[tid].poll_dead++; activity[tid].poll_dead_fd++;
continue; continue;
} }
if (!(fdtab[fd].thread_mask & tid_bit)) { if (!(fdtab[fd].thread_mask & tid_bit)) {
activity[tid].poll_skip++; activity[tid].poll_skip_fd++;
continue; continue;
} }

6
src/ev_poll.c
View File

@ -114,7 +114,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
_HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit); _HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit);
if (!fdtab[fd].owner) { if (!fdtab[fd].owner) {
activity[tid].poll_drop++; activity[tid].poll_drop_fd++;
continue; continue;
} }
_update_fd(fd, &max_add_fd); _update_fd(fd, &max_add_fd);
@ -190,7 +190,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
} }
if (!(fdtab[fd].thread_mask & tid_bit)) { if (!(fdtab[fd].thread_mask & tid_bit)) {
activity[tid].poll_skip++; activity[tid].poll_skip_fd++;
continue; continue;
} }
@ -226,7 +226,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
status--; status--;
if (!fdtab[fd].owner) { if (!fdtab[fd].owner) {
activity[tid].poll_dead++; activity[tid].poll_dead_fd++;
continue; continue;
} }

6
src/ev_select.c
View File

@ -106,7 +106,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
_HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit); _HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit);
if (!fdtab[fd].owner) { if (!fdtab[fd].owner) {
activity[tid].poll_drop++; activity[tid].poll_drop_fd++;
continue; continue;
} }
_update_fd(fd, &max_add_fd); _update_fd(fd, &max_add_fd);
@ -198,12 +198,12 @@ static void _do_poll(struct poller *p, int exp, int wake)
unsigned int n = 0; unsigned int n = 0;
if (!fdtab[fd].owner) { if (!fdtab[fd].owner) {
activity[tid].poll_dead++; activity[tid].poll_dead_fd++;
continue; continue;
} }
if (!(fdtab[fd].thread_mask & tid_bit)) { if (!(fdtab[fd].thread_mask & tid_bit)) {
activity[tid].poll_skip++; activity[tid].poll_skip_fd++;
continue; continue;
} }