From e61828449c6e8c9594befbe1839956ea612c8331 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 15 Apr 2019 18:54:10 +0200 Subject: [PATCH] BUILD: cli/threads: fix build in single-threaded mode 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cli.c b/src/cli.c index 5db1894faf..c5515d1048 100644 --- 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"); -- 2.47.3