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

MINOR: mux-pt: Rely on the endpoint instead of the conn-stream when possible

Browse Source 
Instead of testing if a conn-stream exists or not, we rely on CS_EP_ORPHAN
endpoint flag. In addition, if possible, we access the endpoint from the
mux_pt context. Finally, the endpoint flags are now reported in trace
messages.
This commit is contained in:
Christopher Faulet 2022-03-24 10:51:08 +01:00
parent b041b23ae4
commit 1bceee21e3
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/mux_pt.c
View File

@ -137,7 +137,7 @@ static void pt_trace(enum trace_level level, uint64_t mask, const struct trace_s
const struct buffer *buf = a3; const struct buffer *buf = a3;
const size_t *val = a4; const size_t *val = a4;
if (!ctx|| src->verbosity < PT_VERB_CLEAN) if (!ctx || src->verbosity < PT_VERB_CLEAN)
return; return;
/* Display frontend/backend info by default */ /* Display frontend/backend info by default */
@ -146,12 +146,16 @@ static void pt_trace(enum trace_level level, uint64_t mask, const struct trace_s
if (src->verbosity == PT_VERB_CLEAN) if (src->verbosity == PT_VERB_CLEAN)
return; return;
if (!cs)
cs = ctx->cs;
/* Display the value to the 4th argument (level > STATE) */ /* Display the value to the 4th argument (level > STATE) */
if (src->level > TRACE_LEVEL_STATE && val) if (src->level > TRACE_LEVEL_STATE && val)
chunk_appendf(&trace_buf, " - VAL=%lu", (long)*val); chunk_appendf(&trace_buf, " - VAL=%lu", (long)*val);
/* Display conn and cs info, if defined (pointer + flags) */ /* Display conn and cs info, if defined (pointer + flags) */
chunk_appendf(&trace_buf, " - conn=%p(0x%08x)", conn, conn->flags); chunk_appendf(&trace_buf, " - conn=%p(0x%08x)", conn, conn->flags);
chunk_appendf(&trace_buf, " endp=%p(0x%08x)", ctx->endp, ctx->endp->flags);
if (cs) if (cs)
chunk_appendf(&trace_buf, " cs=%p(0x%08x)", cs, cs->flags); chunk_appendf(&trace_buf, " cs=%p(0x%08x)", cs, cs->flags);
@ -233,8 +237,8 @@ struct task *mux_pt_io_cb(struct task *t, void *tctx, unsigned int status)
{ {
struct mux_pt_ctx *ctx = tctx; struct mux_pt_ctx *ctx = tctx;
TRACE_ENTER(PT_EV_CONN_WAKE, ctx->conn, ctx->cs); TRACE_ENTER(PT_EV_CONN_WAKE, ctx->conn);
if (ctx->cs) { if (!(ctx->endp->flags & CS_EP_ORPHAN)) {
/* There's a small race condition. /* There's a small race condition.
* mux_pt_io_cb() is only supposed to be called if we have no * mux_pt_io_cb() is only supposed to be called if we have no
* stream attached. However, maybe the tasklet got woken up, * stream attached. However, maybe the tasklet got woken up,
@ -249,7 +253,7 @@ struct task *mux_pt_io_cb(struct task *t, void *tctx, unsigned int status)
ctx->conn->subs = NULL; ctx->conn->subs = NULL;
} else if (ctx->cs->data_cb->wake) } else if (ctx->cs->data_cb->wake)
ctx->cs->data_cb->wake(ctx->cs); ctx->cs->data_cb->wake(ctx->cs);
TRACE_DEVEL("leaving waking up CS", PT_EV_CONN_WAKE, ctx->conn, ctx->cs); TRACE_DEVEL("leaving waking up CS", PT_EV_CONN_WAKE, ctx->conn);
return t; return t;
} }
conn_ctrl_drain(ctx->conn); conn_ctrl_drain(ctx->conn);
@ -312,16 +316,15 @@ static int mux_pt_init(struct connection *conn, struct proxy *prx, struct sessio
} }
else { else {
cs_attach_mux(cs, ctx, conn); cs_attach_mux(cs, ctx, conn);
ctx->cs = cs;
ctx->endp = cs->endp; ctx->endp = cs->endp;
} }
conn->ctx = ctx; conn->ctx = ctx;
ctx->cs = cs; ctx->cs = cs;
cs->endp->flags |= CS_EP_RCV_MORE; ctx->endp->flags |= CS_EP_RCV_MORE;
if (global.tune.options & GTUNE_USE_SPLICE) if (global.tune.options & GTUNE_USE_SPLICE)
cs->endp->flags |= CS_EP_MAY_SPLICE; ctx->endp->flags |= CS_EP_MAY_SPLICE;
TRACE_LEAVE(PT_EV_CONN_NEW, conn, cs); TRACE_LEAVE(PT_EV_CONN_NEW, conn);
return 0; return 0;
fail_free_endp: fail_free_endp:
@ -341,15 +344,14 @@ static int mux_pt_init(struct connection *conn, struct proxy *prx, struct sessio
static int mux_pt_wake(struct connection *conn) static int mux_pt_wake(struct connection *conn)
{ {
struct mux_pt_ctx *ctx = conn->ctx; struct mux_pt_ctx *ctx = conn->ctx;
struct conn_stream *cs = ctx->cs;
int ret = 0; int ret = 0;
TRACE_ENTER(PT_EV_CONN_WAKE, ctx->conn, cs); TRACE_ENTER(PT_EV_CONN_WAKE, ctx->conn);
if (cs) { if (!(ctx->endp->flags & CS_EP_ORPHAN)) {
ret = cs->data_cb->wake ? cs->data_cb->wake(cs) : 0; ret = ctx->cs->data_cb->wake ? ctx->cs->data_cb->wake(ctx->cs) : 0;
if (ret < 0) { if (ret < 0) {
TRACE_DEVEL("leaving waking up CS", PT_EV_CONN_WAKE, ctx->conn, cs); TRACE_DEVEL("leaving waking up CS", PT_EV_CONN_WAKE, ctx->conn);
return ret; return ret;
} }
} else { } else {
@ -385,7 +387,8 @@ static int mux_pt_attach(struct connection *conn, struct conn_stream *cs, struct
conn->xprt->unsubscribe(ctx->conn, conn->xprt_ctx, SUB_RETRY_RECV, &ctx->wait_event); conn->xprt->unsubscribe(ctx->conn, conn->xprt_ctx, SUB_RETRY_RECV, &ctx->wait_event);
cs_attach_mux(cs, ctx, conn); cs_attach_mux(cs, ctx, conn);
ctx->cs = cs; ctx->cs = cs;
cs->endp->flags |= CS_EP_RCV_MORE; ctx->endp = cs->endp;
ctx->endp->flags |= CS_EP_RCV_MORE;
TRACE_LEAVE(PT_EV_STRM_NEW, conn, cs); TRACE_LEAVE(PT_EV_STRM_NEW, conn, cs);
return 0; return 0;
@ -397,9 +400,8 @@ static int mux_pt_attach(struct connection *conn, struct conn_stream *cs, struct
static const struct conn_stream *mux_pt_get_first_cs(const struct connection *conn) static const struct conn_stream *mux_pt_get_first_cs(const struct connection *conn)
{ {
struct mux_pt_ctx *ctx = conn->ctx; struct mux_pt_ctx *ctx = conn->ctx;
struct conn_stream *cs = ctx->cs;
return cs; return ctx->cs;
} }
/* Destroy the mux and the associated connection if still attached to this mux /* Destroy the mux and the associated connection if still attached to this mux
@ -409,7 +411,7 @@ static void mux_pt_destroy_meth(void *ctx)
struct mux_pt_ctx *pt = ctx; struct mux_pt_ctx *pt = ctx;
TRACE_POINT(PT_EV_CONN_END, pt->conn, pt->cs); TRACE_POINT(PT_EV_CONN_END, pt->conn, pt->cs);
if (!(pt->cs) || !(pt->conn) || pt->conn->ctx != pt) { if ((pt->endp->flags & CS_EP_ORPHAN) || !(pt->conn) || pt->conn->ctx != pt) {
if (pt->conn->ctx != pt) if (pt->conn->ctx != pt)
pt->endp = NULL; pt->endp = NULL;
mux_pt_destroy(pt); mux_pt_destroy(pt);
@ -447,7 +449,7 @@ static int mux_pt_used_streams(struct connection *conn)
{ {
struct mux_pt_ctx *ctx = conn->ctx; struct mux_pt_ctx *ctx = conn->ctx;
return ctx->cs ? 1 : 0; return (!(ctx->endp->flags & CS_EP_ORPHAN) ? 1 : 0);
} }
/* returns the number of streams still available on a connection */ /* returns the number of streams still available on a connection */