mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: tevt/mux-pt: Add support for termination event logs

Browse Source 
A termination event logs is added to the mux-pt context and appropriate
events are reported for the muxc location. There is no SE events for this
mux.
This commit is contained in:
Christopher Faulet 2024-12-23 15:48:36 +01:00
parent a4c281a190
commit 9cbc3229ec
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/mux_pt.c
View File

@ -23,6 +23,7 @@
struct mux_pt_ctx { struct mux_pt_ctx {
struct sedesc *sd; struct sedesc *sd;
struct connection *conn; struct connection *conn;
uint32_t term_evts_log;
struct wait_event wait_event; struct wait_event wait_event;
}; };
@ -200,6 +201,16 @@ static void pt_trace(enum trace_level level, uint64_t mask, const struct trace_s
} }
} }
static inline void mux_pt_report_term_evt(struct mux_pt_ctx *ctx, enum term_event_type type)
{
struct connection *conn = ctx->conn;
enum term_event_loc loc = tevt_loc_muxc;
if (conn_is_back(conn))
loc += 8;
ctx->term_evts_log = tevt_report_event(ctx->term_evts_log, loc, type);
}
static void mux_pt_destroy(struct mux_pt_ctx *ctx) static void mux_pt_destroy(struct mux_pt_ctx *ctx)
{ {
struct connection *conn = NULL; struct connection *conn = NULL;
@ -298,6 +309,7 @@ static int mux_pt_init(struct connection *conn, struct proxy *prx, struct sessio
ctx->wait_event.tasklet->process = mux_pt_io_cb; ctx->wait_event.tasklet->process = mux_pt_io_cb;
ctx->wait_event.events = 0; ctx->wait_event.events = 0;
ctx->conn = conn; ctx->conn = conn;
ctx->term_evts_log = 0;
if (!sc) { if (!sc) {
ctx->sd = sedesc_new(); ctx->sd = sedesc_new();
@ -468,6 +480,8 @@ static void mux_pt_shut(struct stconn *sc, unsigned int mode, struct se_abort_in
TRACE_ENTER(PT_EV_STRM_SHUT, conn, sc); TRACE_ENTER(PT_EV_STRM_SHUT, conn, sc);
if (mode & (SE_SHW_SILENT|SE_SHW_NORMAL)) { if (mode & (SE_SHW_SILENT|SE_SHW_NORMAL)) {
mux_pt_report_term_evt(ctx, tevt_type_shutw);
if (conn_xprt_ready(conn) && conn->xprt->shutw) if (conn_xprt_ready(conn) && conn->xprt->shutw)
conn->xprt->shutw(conn, conn->xprt_ctx, (mode & SE_SHW_NORMAL)); conn->xprt->shutw(conn, conn->xprt_ctx, (mode & SE_SHW_NORMAL));
if (!(conn->flags & CO_FL_SOCK_WR_SH)) if (!(conn->flags & CO_FL_SOCK_WR_SH))
@ -513,6 +527,7 @@ static size_t mux_pt_rcv_buf(struct stconn *sc, struct buffer *buf, size_t count
b_realign_if_empty(buf); b_realign_if_empty(buf);
ret = conn->xprt->rcv_buf(conn, conn->xprt_ctx, buf, count, flags); ret = conn->xprt->rcv_buf(conn, conn->xprt_ctx, buf, count, flags);
if (conn->flags & CO_FL_ERROR) { if (conn->flags & CO_FL_ERROR) {
mux_pt_report_term_evt(ctx, tevt_type_rcv_err);
se_fl_clr(ctx->sd, SE_FL_RCV_MORE | SE_FL_WANT_ROOM); se_fl_clr(ctx->sd, SE_FL_RCV_MORE | SE_FL_WANT_ROOM);
if (conn_xprt_read0_pending(conn)) if (conn_xprt_read0_pending(conn))
se_fl_set(ctx->sd, SE_FL_EOS); se_fl_set(ctx->sd, SE_FL_EOS);
@ -520,6 +535,7 @@ static size_t mux_pt_rcv_buf(struct stconn *sc, struct buffer *buf, size_t count
TRACE_DEVEL("error on connection", PT_EV_RX_DATA|PT_EV_CONN_ERR, conn, sc); TRACE_DEVEL("error on connection", PT_EV_RX_DATA|PT_EV_CONN_ERR, conn, sc);
} }
else if (conn_xprt_read0_pending(conn)) { else if (conn_xprt_read0_pending(conn)) {
mux_pt_report_term_evt(ctx, tevt_type_shutr);
se_fl_clr(ctx->sd, SE_FL_RCV_MORE | SE_FL_WANT_ROOM); se_fl_clr(ctx->sd, SE_FL_RCV_MORE | SE_FL_WANT_ROOM);
se_fl_set(ctx->sd, (SE_FL_EOI|SE_FL_EOS)); se_fl_set(ctx->sd, (SE_FL_EOI|SE_FL_EOS));
TRACE_DEVEL("read0 on connection", PT_EV_RX_DATA, conn, sc); TRACE_DEVEL("read0 on connection", PT_EV_RX_DATA, conn, sc);
@ -544,6 +560,7 @@ static size_t mux_pt_snd_buf(struct stconn *sc, struct buffer *buf, size_t count
b_del(buf, ret); b_del(buf, ret);
if (conn->flags & CO_FL_ERROR) { if (conn->flags & CO_FL_ERROR) {
mux_pt_report_term_evt(ctx, tevt_type_snd_err);
if (conn_xprt_read0_pending(conn)) if (conn_xprt_read0_pending(conn))
se_fl_set(ctx->sd, SE_FL_EOS); se_fl_set(ctx->sd, SE_FL_EOS);
se_fl_set_error(ctx->sd); se_fl_set_error(ctx->sd);
@ -697,12 +714,14 @@ static int mux_pt_fastfwd(struct stconn *sc, unsigned int count, unsigned int fl
out: out:
if (conn->flags & CO_FL_ERROR) { if (conn->flags & CO_FL_ERROR) {
mux_pt_report_term_evt(ctx, tevt_type_rcv_err);
if (conn_xprt_read0_pending(conn)) if (conn_xprt_read0_pending(conn))
se_fl_set(ctx->sd, SE_FL_EOS); se_fl_set(ctx->sd, SE_FL_EOS);
se_fl_set(ctx->sd, SE_FL_ERROR); se_fl_set(ctx->sd, SE_FL_ERROR);
TRACE_DEVEL("error on connection", PT_EV_RX_DATA|PT_EV_CONN_ERR, conn, sc); TRACE_DEVEL("error on connection", PT_EV_RX_DATA|PT_EV_CONN_ERR, conn, sc);
} }
else if (conn_xprt_read0_pending(conn)) { else if (conn_xprt_read0_pending(conn)) {
mux_pt_report_term_evt(ctx, tevt_type_shutr);
se_fl_set(ctx->sd, (SE_FL_EOS|SE_FL_EOI)); se_fl_set(ctx->sd, (SE_FL_EOS|SE_FL_EOI));
TRACE_DEVEL("read0 on connection", PT_EV_RX_DATA, conn, sc); TRACE_DEVEL("read0 on connection", PT_EV_RX_DATA, conn, sc);
} }
@ -733,6 +752,7 @@ static int mux_pt_resume_fastfwd(struct stconn *sc, unsigned int flags)
out: out:
if (conn->flags & CO_FL_ERROR) { if (conn->flags & CO_FL_ERROR) {
mux_pt_report_term_evt(ctx, tevt_type_snd_err);
if (conn_xprt_read0_pending(conn)) if (conn_xprt_read0_pending(conn))
se_fl_set(ctx->sd, SE_FL_EOS); se_fl_set(ctx->sd, SE_FL_EOS);
se_fl_set_error(ctx->sd); se_fl_set_error(ctx->sd);
@ -774,6 +794,7 @@ static int mux_pt_unsubscribe(struct stconn *sc, int event_type, struct wait_eve
static int mux_pt_ctl(struct connection *conn, enum mux_ctl_type mux_ctl, void *output) static int mux_pt_ctl(struct connection *conn, enum mux_ctl_type mux_ctl, void *output)
{ {
struct mux_pt_ctx *ctx = conn->ctx;
int ret = 0; int ret = 0;
switch (mux_ctl) { switch (mux_ctl) {
@ -787,6 +808,8 @@ static int mux_pt_ctl(struct connection *conn, enum mux_ctl_type mux_ctl, void *
return mux_pt_used_streams(conn); return mux_pt_used_streams(conn);
case MUX_CTL_GET_MAXSTRM: case MUX_CTL_GET_MAXSTRM:
return 1; return 1;
case MUX_CTL_TEVTS:
return ctx->term_evts_log;
default: default:
return -1; return -1;
} }
@ -802,6 +825,9 @@ static int mux_pt_sctl(struct stconn *sc, enum mux_sctl_type mux_sctl, void *out
*((int64_t *)output) = 0; *((int64_t *)output) = 0;
return ret; return ret;
case MUX_SCTL_TEVTS:
return sc->sedesc->term_evts_log;
default: default:
return -1; return -1;
} }