RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-02 01:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: quic: delete timer task on quic_close()

Browse Source 
The timer task is attached to the connection-pinned thread. Only this
thread can delete it. With the future refcount implementation of
quic_conn, every thread can be responsible to remove the quic_conn via
quic_conn_free(). Thus, the timer task deletion is moved from the
calling function quic_close().
This commit is contained in:
Amaury Denoyelle 2021-12-23 15:06:56 +01:00
parent e81fed9a54
commit 0a29e13835
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xprt_quic.c
View File

@ -637,7 +637,7 @@ static inline void qc_set_timer(struct quic_conn *qc)
if (tick_isset(pto))
qc->timer = pto;
out:
if (qc->timer != TICK_ETERNITY)
if (qc->timer_task && qc->timer != TICK_ETERNITY)
task_schedule(qc->timer_task, qc->timer);
TRACE_LEAVE(QUIC_EV_CONN_STIMER, qc, pktns);
}
@ -3213,8 +3213,7 @@ static void quic_conn_free(struct quic_conn *qc)
for (i = 0; i < QUIC_TLS_ENC_LEVEL_MAX; i++)
quic_conn_enc_level_uninit(&qc->els[i]);
if (qc->timer_task)
task_destroy(qc->timer_task);
pool_free(pool_head_quic_conn_rxbuf, qc->rx.buf.area);
pool_free(pool_head_quic_conn, qc);
}
@ -3223,6 +3222,13 @@ void quic_close(struct connection *conn, void *xprt_ctx)
{
struct ssl_sock_ctx *conn_ctx = xprt_ctx;
struct quic_conn *qc = conn_ctx->conn->qc;
/* This task must be deleted by the connection-pinned thread. */
if (qc->timer_task) {
task_destroy(qc->timer_task);
qc->timer_task = NULL;
}
quic_conn_free(qc);
}