MINOR: cli/activity: remove "fd_del" and "fd_skip" from show activity

These variables are never set anymore and were always reported as zero.

diff --git a/include/types/activity.h b/include/types/activity.h
index 605fe7a74749a949906166c89a42435b491a7f2d..2a6f5bd6afa843f27df9dfd65fcdba78d80a1d97 100644 (file)
--- a/include/types/activity.h
+++ b/include/types/activity.h
@@ -39,11 +39,11 @@ struct activity {
        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 fd_skip;      // fd cache skipped another thread's FD
        unsigned int fd_lock;      // fd cache skipped a locked FD
-       unsigned int fd_del;       // fd cache detected a deleted 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
+       unsigned int tasksw;       // total number of task switches
        unsigned int empty_rq;     // calls to process_runnable_tasks() with nothing for the thread
        unsigned int long_rq;      // process_runnable_tasks() left with tasks in the run queue
        unsigned int cpust_total;  // sum of half-ms stolen per thread
@@ -54,8 +54,6 @@ struct activity {
        unsigned int accepted;     // accepted incoming connections
        unsigned int accq_pushed;  // accept queue connections pushed
        unsigned int accq_full;    // accept queue connection not pushed because full
-       unsigned int ctxsw;        // total number of context switches
-       unsigned int tasksw;       // total number of task switches
        char __pad[0]; // unused except to check remaining room
        char __end[0] __attribute__((aligned(64))); // align size to 64.
 };

diff --git a/src/cli.c b/src/cli.c
index 4b430a930a7602af4528c0d2ac3402d28ecf8ef0..118f8fd4cca0259acc102d302b7f93f386129461 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -1078,9 +1078,7 @@ static int cli_io_handler_show_activity(struct appctx *appctx)
        chunk_appendf(&trash, "\npoll_drop:");    for (thr = 0; thr < global.nbthread; thr++) chunk_appendf(&trash, " %u", activity[thr].poll_drop);
        chunk_appendf(&trash, "\npoll_dead:");    for (thr = 0; thr < global.nbthread; thr++) chunk_appendf(&trash, " %u", activity[thr].poll_dead);
        chunk_appendf(&trash, "\npoll_skip:");    for (thr = 0; thr < global.nbthread; thr++) chunk_appendf(&trash, " %u", activity[thr].poll_skip);
-       chunk_appendf(&trash, "\nfd_skip:");      for (thr = 0; thr < global.nbthread; thr++) chunk_appendf(&trash, " %u", activity[thr].fd_skip);
        chunk_appendf(&trash, "\nfd_lock:");      for (thr = 0; thr < global.nbthread; thr++) chunk_appendf(&trash, " %u", activity[thr].fd_lock);
-       chunk_appendf(&trash, "\nfd_del:");       for (thr = 0; thr < global.nbthread; thr++) chunk_appendf(&trash, " %u", activity[thr].fd_del);
        chunk_appendf(&trash, "\nconn_dead:");    for (thr = 0; thr < global.nbthread; thr++) chunk_appendf(&trash, " %u", activity[thr].conn_dead);
        chunk_appendf(&trash, "\nstream:");       for (thr = 0; thr < global.nbthread; thr++) chunk_appendf(&trash, " %u", activity[thr].stream);
        chunk_appendf(&trash, "\nempty_rq:");     for (thr = 0; thr < global.nbthread; thr++) chunk_appendf(&trash, " %u", activity[thr].empty_rq);