]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: cli/fd: show fd's tgid and refcount in "show fd"
authorWilly Tarreau <w@1wt.eu>
Fri, 8 Jul 2022 08:23:01 +0000 (10:23 +0200)
committerWilly Tarreau <w@1wt.eu>
Fri, 15 Jul 2022 17:58:06 +0000 (19:58 +0200)
We really need to display these values now.

src/cli.c

index 722d0c63d9e731dc0ab9ae287896c7cabb3c749d..07d104dd0dc03bf9180344eea485a9899fb315bf 100644 (file)
--- 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);