From: Willy Tarreau <w@1wt.eu>
Date: Fri, 8 Jul 2022 08:23:01 +0000 (+0200)
Subject: MINOR: cli/fd: show fd's tgid and refcount in "show fd"
X-Git-Tag: v2.7-dev2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2431823703a09966c888fdf716b4f731f4893af;p=thirdparty%2Fhaproxy.git

MINOR: cli/fd: show fd's tgid and refcount in "show fd"

We really need to display these values now.
---

diff --git a/src/cli.c b/src/cli.c
index 722d0c63d9..07d104dd0d 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1304,7 +1304,7 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
 			suspicious = 1;
 
 		chunk_printf(&trash,
-			     "  %5d : st=0x%06x(%c%c %c%c%c%c%c W:%c%c%c R:%c%c%c) tmask=0x%lx umask=0x%lx owner=%p iocb=%p(",
+			     "  %5d : st=0x%06x(%c%c %c%c%c%c%c W:%c%c%c R:%c%c%c) ref=%#x gid=%d tmask=0x%lx umask=0x%lx owner=%p iocb=%p(",
 			     fd,
 			     fdt.state,
 			     (fdt.state & FD_CLONED) ? 'C' : 'c',
@@ -1320,6 +1320,8 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
 			     (fdt.state & FD_EV_SHUT_R) ? 'S' : 's',
 			     (fdt.state & FD_EV_READY_R)  ? 'R' : 'r',
 			     (fdt.state & FD_EV_ACTIVE_R) ? 'A' : 'a',
+			     (fdt.refc_tgid >> 4) & 0xffff,
+			     (fdt.refc_tgid) & 0xffff,
 			     fdt.thread_mask, fdt.update_mask,
 			     fdt.owner,
 			     fdt.iocb);