]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: cli/threads: fix build in single-threaded mode
authorWilly Tarreau <w@1wt.eu>
Mon, 15 Apr 2019 16:54:10 +0000 (18:54 +0200)
committerWilly Tarreau <w@1wt.eu>
Mon, 15 Apr 2019 16:55:31 +0000 (18:55 +0200)
Commit a8f57d51a ("MINOR: cli/activity: report the accept queue sizes
in "show activity"") broke the single-threaded build because the
accept-rings are not implemented there. Let's ifdef this out. Ideally
we should start to think about always having such elements initialized
even without threads to improve the test coverage.

src/cli.c

index 5db1894faf218f744a9e49a89335f4bd9dcde32b..c5515d10485ba5147f49acd5d8c5700b58ba6cb6 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -1071,7 +1071,9 @@ static int cli_io_handler_show_activity(struct appctx *appctx)
        chunk_appendf(&trash, "\naccepted:");     for (thr = 0; thr < global.nbthread; thr++) chunk_appendf(&trash, " %u", activity[thr].accepted);
        chunk_appendf(&trash, "\naccq_pushed:");  for (thr = 0; thr < global.nbthread; thr++) chunk_appendf(&trash, " %u", activity[thr].accq_pushed);
        chunk_appendf(&trash, "\naccq_full:");    for (thr = 0; thr < global.nbthread; thr++) chunk_appendf(&trash, " %u", activity[thr].accq_full);
+#ifdef USE_THREAD
        chunk_appendf(&trash, "\naccq_ring:");    for (thr = 0; thr < global.nbthread; thr++) chunk_appendf(&trash, " %u", (accept_queue_rings[thr].tail - accept_queue_rings[thr].head + ACCEPT_QUEUE_SIZE)%ACCEPT_QUEUE_SIZE);
+#endif
 
        chunk_appendf(&trash, "\n");