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

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.

diff --git a/include/haproxy/activity-t.h b/include/haproxy/activity-t.h
index 4e2f9f0935f35460f9b03180b7a5a179b65597df..77840dc1b8ff308d3c01600de3bbed089b1954fb 100644 (file)
--- a/include/haproxy/activity-t.h
+++ b/include/haproxy/activity-t.h
@@ -42,9 +42,9 @@ struct activity {
        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_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_dead;    // poller woke up with a dead FD
-       unsigned int poll_skip;    // poller skipped another thread's FD
+       unsigned int poll_drop_fd; // poller dropped a dead FD from the update list
+       unsigned int poll_dead_fd; // poller woke up with a dead 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 stream;       // calls to process_stream()
        unsigned int ctxsw;        // total number of context switches

diff --git a/src/cli.c b/src/cli.c
index 1939ec3e6d621dada17226b8f53a099b5907b8b0..528f93560837388c66293d7c0a670cccc81ac0ca 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -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, "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_drop:");    SHOW_TOT(thr, activity[thr].poll_drop);
-       chunk_appendf(&trash, "poll_dead:");    SHOW_TOT(thr, activity[thr].poll_dead);
-       chunk_appendf(&trash, "poll_skip:");    SHOW_TOT(thr, activity[thr].poll_skip);
+       chunk_appendf(&trash, "poll_drop_fd:"); SHOW_TOT(thr, activity[thr].poll_drop_fd);
+       chunk_appendf(&trash, "poll_dead_fd:"); SHOW_TOT(thr, activity[thr].poll_dead_fd);
+       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, "stream:");       SHOW_TOT(thr, activity[thr].stream);
        chunk_appendf(&trash, "pool_fail:");    SHOW_TOT(thr, activity[thr].pool_fail);

diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index e5437a28d822485ec982dcd84763c3ae5c7c76aa..5102b10760505ebc58379339b96db132cb4ae8f9 100644 (file)
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -142,7 +142,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
 
                _HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit);
                if (!fdtab[fd].owner) {
-                       activity[tid].poll_drop++;
+                       activity[tid].poll_drop_fd++;
                        continue;
                }
 
@@ -208,13 +208,13 @@ static void _do_poll(struct poller *p, int exp, int wake)
                fd = epoll_events[count].data.fd;
 
                if (!fdtab[fd].owner) {
-                       activity[tid].poll_dead++;
+                       activity[tid].poll_dead_fd++;
                        continue;
                }
 
                if (!(fdtab[fd].thread_mask & tid_bit)) {
                        /* FD has been migrated */
-                       activity[tid].poll_skip++;
+                       activity[tid].poll_skip_fd++;
                        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_send, ~tid_bit);

diff --git a/src/ev_evports.c b/src/ev_evports.c
index 50d9a1e7d91a2ff0777c64a2c0e505a682702d0d..a00813584f29c1629a253aad93f52ac8ad988ae2 100644 (file)
--- a/src/ev_evports.c
+++ b/src/ev_evports.c
@@ -125,7 +125,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
 
                _HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit);
                if (fdtab[fd].owner == NULL) {
-                       activity[tid].poll_drop++;
+                       activity[tid].poll_drop_fd++;
                        continue;
                }
 
@@ -217,12 +217,12 @@ static void _do_poll(struct poller *p, int exp, int wake)
                events = evports_evlist[i].portev_events;
 
                if (fdtab[fd].owner == NULL) {
-                       activity[tid].poll_dead++;
+                       activity[tid].poll_dead_fd++;
                        continue;
                }
 
                if (!(fdtab[fd].thread_mask & tid_bit)) {
-                       activity[tid].poll_skip++;
+                       activity[tid].poll_skip_fd++;
                        continue;
                }
 

diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index 9df987aa847766363d8c1b7e8ea554859df9642e..539394e7fe769125a1b54111b0b00e9837b3a168 100644 (file)
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -101,7 +101,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
 
                _HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit);
                if (!fdtab[fd].owner) {
-                       activity[tid].poll_drop++;
+                       activity[tid].poll_drop_fd++;
                        continue;
                }
                changes = _update_fd(fd, changes);
@@ -184,12 +184,12 @@ static void _do_poll(struct poller *p, int exp, int wake)
                fd = kev[count].ident;
 
                if (!fdtab[fd].owner) {
-                       activity[tid].poll_dead++;
+                       activity[tid].poll_dead_fd++;
                        continue;
                }
 
                if (!(fdtab[fd].thread_mask & tid_bit)) {
-                       activity[tid].poll_skip++;
+                       activity[tid].poll_skip_fd++;
                        continue;
                }
 

diff --git a/src/ev_poll.c b/src/ev_poll.c
index 69368ce4e3647b88066fe46b479d04a7f8de562e..e63334e14ad881ef16e91d0f7829889f47f5503b 100644 (file)
--- a/src/ev_poll.c
+++ b/src/ev_poll.c
@@ -114,7 +114,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
 
                _HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit);
                if (!fdtab[fd].owner) {
-                       activity[tid].poll_drop++;
+                       activity[tid].poll_drop_fd++;
                        continue;
                }
                _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)) {
-                                       activity[tid].poll_skip++;
+                                       activity[tid].poll_skip_fd++;
                                        continue;
                                }
 
@@ -226,7 +226,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
                status--;
 
                if (!fdtab[fd].owner) {
-                       activity[tid].poll_dead++;
+                       activity[tid].poll_dead_fd++;
                        continue;
                }
 

diff --git a/src/ev_select.c b/src/ev_select.c
index d79f09b2e2e4a529add1136f236193b6b1c28753..544b7f21175e9c34d45b84a8765bf28c0988629e 100644 (file)
--- a/src/ev_select.c
+++ b/src/ev_select.c
@@ -106,7 +106,7 @@ static void _do_poll(struct poller *p, int exp, int wake)
 
                _HA_ATOMIC_AND(&fdtab[fd].update_mask, ~tid_bit);
                if (!fdtab[fd].owner) {
-                       activity[tid].poll_drop++;
+                       activity[tid].poll_drop_fd++;
                        continue;
                }
                _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;
 
                        if (!fdtab[fd].owner) {
-                               activity[tid].poll_dead++;
+                               activity[tid].poll_dead_fd++;
                                continue;
                        }
 
                        if (!(fdtab[fd].thread_mask & tid_bit)) {
-                               activity[tid].poll_skip++;
+                               activity[tid].poll_skip_fd++;
                                continue;
                        }