From: Willy Tarreau <w@1wt.eu>
Date: Fri, 15 Jul 2022 14:18:43 +0000 (+0200)
Subject: MINOR: cli/streams: show a stream's tgid next to its thread ID
X-Git-Tag: v2.7-dev2~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd75b64cdfaa50588509d3b2aa00029cfe52e4bd;p=thirdparty%2Fhaproxy.git

MINOR: cli/streams: show a stream's tgid next to its thread ID

We now display both the global thread ID and the tgid/ltid pair so that
it's easier to match it with the FD.
---

diff --git a/src/stream.c b/src/stream.c
index e90ac35254..5187eb9eec 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -3284,7 +3284,7 @@ static int stats_dump_full_strm_to_buffer(struct stconn *sc, struct stream *strm
 		}
 
 		chunk_appendf(&trash,
-			     "  task=%p (state=0x%02x nice=%d calls=%u rate=%u exp=%s tid=%d%s",
+			     "  task=%p (state=0x%02x nice=%d calls=%u rate=%u exp=%s tid=%d(%d/%d)%s",
 			     strm->task,
 			     strm->task->state,
 			     strm->task->nice, strm->task->calls, read_freq_ctr(&strm->call_rate),
@@ -3293,6 +3293,8 @@ static int stats_dump_full_strm_to_buffer(struct stconn *sc, struct stream *strm
 			                     human_time(TICKS_TO_MS(strm->task->expire - now_ms),
 			                     TICKS_TO_MS(1000)) : "<NEVER>",
 		             strm->task->tid,
+		             ha_thread_info[strm->task->tid].tgid,
+		             ha_thread_info[strm->task->tid].ltid,
 			     task_in_rq(strm->task) ? ", running" : "");
 
 		chunk_appendf(&trash,