From f5459ae349a4cf7118a5c08f8fe983438917d98a Mon Sep 17 00:00:00 2001 From: Amaury Denoyelle Date: Wed, 16 Oct 2024 17:56:15 +0200 Subject: [PATCH] MINOR: mux-quic: encapsulate QCC tasklet wakeup --- src/mux_quic.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/src/mux_quic.c b/src/mux_quic.c index 32ca8377d9..895f227502 100644 --- a/src/mux_quic.c +++ b/src/mux_quic.c @@ -386,6 +386,11 @@ static void qcc_refresh_timeout(struct qcc *qcc) TRACE_LEAVE(QMUX_EV_QCS_NEW, qcc->conn); } +static void qcc_wakeup(struct qcc *qcc) +{ + tasklet_wakeup(qcc->wait_event.tasklet); +} + /* Mark a stream as open if it was idle. This can be used on every * successful emission/reception operation to update the stream state. */ @@ -711,7 +716,7 @@ void qcc_set_error(struct qcc *qcc, int err, int app) * is too tedious too not forget a wakeup outside of this function for * the moment. */ - tasklet_wakeup(qcc->wait_event.tasklet); + qcc_wakeup(qcc); } /* Increment glitch counter for connection by steps. If configured @@ -1065,7 +1070,7 @@ static void qcs_consume(struct qcs *qcs, uint64_t bytes) frm->max_stream_data.max_stream_data = qcs->rx.msd; LIST_APPEND(&qcc->lfctl.frms, &frm->list); - tasklet_wakeup(qcc->wait_event.tasklet); + qcc_wakeup(qcc); } conn_fctl: @@ -1083,7 +1088,7 @@ static void qcs_consume(struct qcs *qcs, uint64_t bytes) frm->max_data.max_data = qcc->lfctl.md; LIST_APPEND(&qcs->qcc->lfctl.frms, &frm->list); - tasklet_wakeup(qcs->qcc->wait_event.tasklet); + qcc_wakeup(qcc); } TRACE_LEAVE(QMUX_EV_QCS_RECV, qcc->conn, qcs); @@ -1343,7 +1348,7 @@ void qcc_reset_stream(struct qcs *qcs, int err) } qcc_send_stream(qcs, 1, 0); - tasklet_wakeup(qcc->wait_event.tasklet); + qcc_wakeup(qcc); } /* Register stream for emission of STREAM, STOP_SENDING or RESET_STREAM. @@ -1391,7 +1396,7 @@ void qcc_abort_stream_read(struct qcs *qcs) qcs->flags |= (QC_SF_TO_STOP_SENDING|QC_SF_READ_ABORTED); qcc_send_stream(qcs, 1, 0); - tasklet_wakeup(qcc->wait_event.tasklet); + qcc_wakeup(qcc); end: TRACE_LEAVE(QMUX_EV_QCC_NEW, qcc->conn, qcs); @@ -1424,7 +1429,7 @@ int qcc_install_app_ops(struct qcc *qcc, const struct qcc_app_ops *app_ops) TRACE_ERROR("app ops finalize error", QMUX_EV_QCC_NEW, qcc->conn); goto err; } - tasklet_wakeup(qcc->wait_event.tasklet); + qcc_wakeup(qcc); } TRACE_LEAVE(QMUX_EV_QCC_NEW, qcc->conn); @@ -1603,7 +1608,7 @@ int qcc_recv_max_data(struct qcc *qcc, uint64_t max) TRACE_DATA("increase remote max-data", QMUX_EV_QCC_RECV, qcc->conn); if (unblock_real) - tasklet_wakeup(qcc->wait_event.tasklet); + qcc_wakeup(qcc); if (unblock_soft) qcc_notify_fctl(qcc); @@ -1649,7 +1654,7 @@ int qcc_recv_max_stream_data(struct qcc *qcc, uint64_t id, uint64_t max) TRACE_DATA("increase remote max-stream-data", QMUX_EV_QCC_RECV|QMUX_EV_QCS_RECV, qcc->conn, qcs); if (unblock_real) { /* TODO optim: only wakeup IO-CB if stream has data to sent. */ - tasklet_wakeup(qcc->wait_event.tasklet); + qcc_wakeup(qcc); } if (unblock_soft) { @@ -1899,7 +1904,7 @@ static int qcc_release_remote_stream(struct qcc *qcc, uint64_t id) frm->max_streams_bidi.max_streams = qcc->lfctl.ms_bidi + qcc->lfctl.cl_bidi_r; LIST_APPEND(&qcc->lfctl.frms, &frm->list); - tasklet_wakeup(qcc->wait_event.tasklet); + qcc_wakeup(qcc); qcc->lfctl.ms_bidi += qcc->lfctl.cl_bidi_r; qcc->lfctl.cl_bidi_r = 0; @@ -2407,7 +2412,7 @@ static int qcc_io_send(struct qcc *qcc) } if (!qfctl_rblocked(&qcc->tx.fc)) - tasklet_wakeup(qcc->wait_event.tasklet); + qcc_wakeup(qcc); } out: @@ -2952,7 +2957,7 @@ static int qmux_init(struct connection *conn, struct proxy *prx, LIST_APPEND(&mux_stopping_data[tid].list, &conn->stopping_list); /* init read cycle */ - tasklet_wakeup(qcc->wait_event.tasklet); + qcc_wakeup(qcc); TRACE_LEAVE(QMUX_EV_QCC_NEW, conn); return 0; @@ -3098,7 +3103,7 @@ static size_t qmux_strm_rcv_buf(struct stconn *sc, struct buffer *buf, qcs->flags &= ~QC_SF_DEM_FULL; if (!(qcc->flags & QC_CF_ERRL)) - tasklet_wakeup(qcc->wait_event.tasklet); + qcc_wakeup(qcc); } TRACE_LEAVE(QMUX_EV_STRM_RECV, qcc->conn, qcs); @@ -3162,7 +3167,7 @@ static size_t qmux_strm_snd_buf(struct stconn *sc, struct buffer *buf, if (data || fin) qcc_send_stream(qcs, 0, data); if (!(qcs->qcc->wait_event.events & SUB_RETRY_SEND)) - tasklet_wakeup(qcs->qcc->wait_event.tasklet); + qcc_wakeup(qcs->qcc); } end: @@ -3283,7 +3288,7 @@ static size_t qmux_strm_done_ff(struct stconn *sc) if (data || qcs->flags & QC_SF_FIN_STREAM) qcc_send_stream(qcs, 0, data); if (!(qcs->qcc->wait_event.events & SUB_RETRY_SEND)) - tasklet_wakeup(qcc->wait_event.tasklet); + qcc_wakeup(qcc); end: TRACE_LEAVE(QMUX_EV_STRM_SEND, qcs->qcc->conn, qcs); @@ -3381,7 +3386,7 @@ static void qmux_strm_shut(struct stconn *sc, unsigned int mode, struct se_abort qcc_reset_stream(qcs, 0); } - tasklet_wakeup(qcc->wait_event.tasklet); + qcc_wakeup(qcc); } out: -- 2.47.2