From: Willy Tarreau <w@1wt.eu>
Date: Mon, 4 Jul 2022 11:33:13 +0000 (+0200)
Subject: MINOR: proxy: use tg->threads_enabled in hard_stop() to detect stopped threads
X-Git-Tag: v2.7-dev2~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7509ec369a811e856c722a788a766550cde9410f;p=thirdparty%2Fhaproxy.git

MINOR: proxy: use tg->threads_enabled in hard_stop() to detect stopped threads

Let's rely on tg->threads_enabled there to detect running threads. We
should probably have a dedicated function for this in order to simplify
the code and avoid the risk of using the wrong group ID.
---

diff --git a/src/proxy.c b/src/proxy.c
index c10a8cf838..7c07321276 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -2140,7 +2140,7 @@ struct task *hard_stop(struct task *t, void *context, unsigned int state)
 		send_log(NULL, LOG_WARNING, "Some tasks resisted to hard-stop, exiting now.\n");
 		killed = 2;
 		for (thr = 0; thr < global.nbthread; thr++)
-			if (((all_threads_mask & ~tid_bit) >> thr) & 1)
+			if (ha_thread_info[thr].tg->threads_enabled & ha_thread_info[thr].ltid_bit)
 				wake_thread(thr);
 		t->expire = TICK_ETERNITY;
 		return t;