MINOR: global: add some global activity counters to help debugging
A number of counters have been added at special places helping better
understanding certain bug reports. These counters are maintained per
thread and are shown using "show activity" on the CLI. The "clear
counters" commands also reset these counters. The output is sent as a
single write(), which currently produces up to about 7 kB of data for
64 threads. If more counters are added, it may be necessary to write
into multiple buffers, or to reset the counters.
To backport to 1.8 to help collect more detailed bug reports.
diff --git a/src/haproxy.c b/src/haproxy.c
index a8d0fad..952733e 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -165,6 +165,8 @@
/* others NULL OK */
};
+struct activity activity[MAX_THREADS] __attribute__((aligned(64))) = { };
+
/*********************************************************************/
int stopping; /* non zero means stopping in progress */
@@ -2371,7 +2373,7 @@
/* Runs the polling loop */
static void run_poll_loop()
{
- int next;
+ int next, exp;
tv_update_date(0,1);
while (1) {
@@ -2389,18 +2391,27 @@
break;
/* expire immediately if events are pending */
- if (fd_cache_num || (active_tasks_mask & tid_bit) || signal_queue_len || (active_applets_mask & tid_bit))
- next = now_ms;
+ exp = now_ms;
+ if (fd_cache_num)
+ activity[tid].wake_cache++;
+ else if (active_tasks_mask & tid_bit)
+ activity[tid].wake_tasks++;
+ else if (active_applets_mask & tid_bit)
+ activity[tid].wake_applets++;
+ else if (signal_queue_len)
+ activity[tid].wake_signal++;
+ else
+ exp = next;
/* The poller will ensure it returns around <next> */
- cur_poller.poll(&cur_poller, next);
+ cur_poller.poll(&cur_poller, exp);
fd_process_cached_events();
applet_run_active();
/* Synchronize all polling loops */
sync_poll_loop();
-
+ activity[tid].loops++;
}
}