From 95317289e9194c90778367227f945e40b14b96fe Mon Sep 17 00:00:00 2001 From: Yves Lafon Date: Mon, 26 Feb 2018 11:10:37 +0100 Subject: [PATCH] MINOR: stats: display the number of threads in the statistics. Add the nbthread global variable to the output, matching nbproc. This may be backported to 1.8 --- include/types/stats.h | 1 + src/stats.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/types/stats.h b/include/types/stats.h index 7022468712..b4124334aa 100644 --- a/include/types/stats.h +++ b/include/types/stats.h @@ -239,6 +239,7 @@ enum info_field { INF_NAME, INF_VERSION, INF_RELEASE_DATE, + INF_NBTHREAD, INF_NBPROC, INF_PROCESS_NUM, INF_PID, diff --git a/src/stats.c b/src/stats.c index 61e0549810..b592ced57e 100644 --- a/src/stats.c +++ b/src/stats.c @@ -81,6 +81,7 @@ const char *info_field_names[INF_TOTAL_FIELDS] = { [INF_NAME] = "Name", [INF_VERSION] = "Version", [INF_RELEASE_DATE] = "Release_date", + [INF_NBTHREAD] = "Nbthread", [INF_NBPROC] = "Nbproc", [INF_PROCESS_NUM] = "Process_num", [INF_PID] = "Pid", @@ -2277,7 +2278,7 @@ static void stats_dump_html_info(struct stream_interface *si, struct uri_auth *u "
\n" "

> General process information

\n" "
\n" - "

pid = %d (process #%d, nbproc = %d)
\n" + "

pid = %d (process #%d, nbproc = %d, nbthread = %d)
\n" "uptime = %dd %dh%02dm%02ds
\n" "system limits: memmax = %s%s; ulimit-n = %d
\n" "maxsock = %d; maxconn = %d; maxpipes = %d
\n" @@ -2311,7 +2312,7 @@ static void stats_dump_html_info(struct stream_interface *si, struct uri_auth *u (uri->flags & ST_SHNODE) ? (uri->node ? uri->node : global.node) : "", (uri->flags & ST_SHDESC) ? ": " : "", (uri->flags & ST_SHDESC) ? (uri->desc ? uri->desc : global.desc) : "", - pid, relative_pid, global.nbproc, + pid, relative_pid, global.nbproc, global.nbthread, up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60), global.rlimit_memmax ? ultoa(global.rlimit_memmax) : "unlimited", @@ -3203,6 +3204,7 @@ int stats_fill_info(struct field *info, int len) info[INF_VERSION] = mkf_str(FO_PRODUCT|FN_OUTPUT|FS_SERVICE, HAPROXY_VERSION); info[INF_RELEASE_DATE] = mkf_str(FO_PRODUCT|FN_OUTPUT|FS_SERVICE, HAPROXY_DATE); + info[INF_NBTHREAD] = mkf_u32(FO_CONFIG|FS_SERVICE, global.nbthread); info[INF_NBPROC] = mkf_u32(FO_CONFIG|FS_SERVICE, global.nbproc); info[INF_PROCESS_NUM] = mkf_u32(FO_KEY, relative_pid); info[INF_PID] = mkf_u32(FO_STATUS, pid); -- 2.47.3