RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-18 09:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: xprt: add a new show_fd() helper to complete some "show fd" dumps.

Browse Source 
Just like we did for the muxes, now the transport layers will have the
ability to provide helpers to report more detailed information about their
internal context. When the helper is not known, the pointer continues to
be dumped as-is if it's not NULL. This way a transport with no context nor
dump function will not add a useless "xprt_ctx=(nil)" but the pointer will
be emitted if valid or if a helper is defined.
This commit is contained in:
Willy Tarreau 2021-01-20 15:30:56 +01:00
parent 37be953424
commit 108a271049
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/haproxy/connection-t.h
View File

@ -381,6 +381,7 @@ struct xprt_ops {
int (*unsubscribe)(struct connection *conn, void *xprt_ctx, int event_type, struct wait_event *es); /* Unsubscribe <es> from events */
int (*remove_xprt)(struct connection *conn, void *xprt_ctx, void *toremove_ctx, const struct xprt_ops *newops, void *newctx); /* Remove an xprt from the connection, used by temporary xprt such as the handshake one */
int (*add_xprt)(struct connection *conn, void *xprt_ctx, void *toadd_ctx, const struct xprt_ops *toadd_ops, void **oldxprt_ctx, const struct xprt_ops **oldxprt_ops); /* Add a new XPRT as the new xprt, and return the old one */
void (*show_fd)(struct buffer *, const struct connection *, const void *ctx); /* append some data about xprt for "show fd" */
};
/* mux_ops describes the mux operations, which are to be performed at the

8
src/cli.c
View File

@ -1106,8 +1106,12 @@ static int cli_io_handler_show_fd(struct appctx *appctx)
chunk_appendf(&trash, " nomux");
chunk_appendf(&trash, " xprt=%s", xprt ? xprt->name : "");
if (xprt)
chunk_appendf(&trash, " xprt_ctx=%p", xprt_ctx);
if (xprt) {
if (xprt_ctx || xprt->show_fd)
chunk_appendf(&trash, " xprt_ctx=%p", xprt_ctx);
if (xprt->show_fd)
xprt->show_fd(&trash, conn, xprt_ctx);
}
}
else if (fdt.iocb == sock_accept_iocb) {
chunk_appendf(&trash, ") l.st=%s fe=%s",