RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-17 02:56:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: mux-quic: refactor refresh timeout function

Browse Source 
Try to reorganize qcc_refresh_timeout() to improve its readability. The
main objective is to reduce the indentation level and if sequences by
using goto statement to the end of the function. Also, backend and
frontend code path should be more explicit with this new version.
This commit is contained in:
Amaury Denoyelle 2022-08-01 17:59:38 +02:00
parent 418ba21461
commit 6ec9837fca
1 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/mux_quic.c
View File

@ -290,42 +290,53 @@ static void qcc_refresh_timeout(struct qcc *qcc)
if (!qcc->task) if (!qcc->task)
goto leave; goto leave;
/* Calculate the timeout. */ /* Check if upper layer is responsible of timeout management. */
if (qcc_may_expire(qcc)) { if (!qcc_may_expire(qcc)) {
TRACE_DEVEL("not eligible for timeout", QMUX_EV_QCC_WAKE, qcc->conn);
qcc->task->expire = TICK_ETERNITY;
task_queue(qcc->task);
goto leave;
}
/* TODO if connection is idle on frontend and proxy is disabled, remove
* it with global close_spread delay applied.
*/
/* TODO implement specific timeouts /* TODO implement specific timeouts
* - http-requset for waiting on incomplete streams * - http-requset for waiting on incomplete streams
* - client-fin for graceful shutdown * - client-fin for graceful shutdown
*/ */
/* Frontend timeout management
* - detached streams with data left to send -> default timeout
* - idle after stream processing -> timeout http-keep-alive
*/
if (!conn_is_back(qcc->conn)) {
int timeout;
if (qcc->nb_hreq) { if (qcc->nb_hreq) {
/* detached streams left. */
TRACE_DEVEL("one or more requests still in progress", QMUX_EV_QCC_WAKE, qcc->conn); TRACE_DEVEL("one or more requests still in progress", QMUX_EV_QCC_WAKE, qcc->conn);
qcc->task->expire = tick_add_ifset(now_ms, qcc->timeout); qcc->task->expire = tick_add_ifset(now_ms, qcc->timeout);
task_queue(qcc->task);
goto leave;
} }
else if (!conn_is_back(qcc->conn) && qcc->largest_bidi_r > 0x00) {
int timeout = tick_isset(px->timeout.httpka) ? /* Use http-request timeout if keep-alive timeout not set */
timeout = tick_isset(px->timeout.httpka) ?
px->timeout.httpka : px->timeout.httpreq; px->timeout.httpka : px->timeout.httpreq;
TRACE_DEVEL("at least one request achieved but none currently in progress", QMUX_EV_QCC_WAKE, qcc->conn); TRACE_DEVEL("at least one request achieved but none currently in progress", QMUX_EV_QCC_WAKE, qcc->conn);
qcc->task->expire = tick_add_ifset(qcc->idle_start, qcc->task->expire = tick_add_ifset(qcc->idle_start, timeout);
timeout);
} }
/* fallback to default timeout if none set. */ /* fallback to default timeout if frontend specific undefined or for
* backend connections.
*/
if (!tick_isset(qcc->task->expire)) { if (!tick_isset(qcc->task->expire)) {
TRACE_DEVEL("fallback to default timeout", QMUX_EV_QCC_WAKE, qcc->conn); TRACE_DEVEL("fallback to default timeout", QMUX_EV_QCC_WAKE, qcc->conn);
qcc->task->expire = tick_add_ifset(now_ms, qcc->timeout); qcc->task->expire = tick_add_ifset(now_ms, qcc->timeout);
} }
/* TODO if connection is idle on frontend and proxy is
* disabled, remove it with global close_spread delay applied.
*/
}
else {
TRACE_DEVEL("not eligible for timeout", QMUX_EV_QCC_WAKE, qcc->conn);
qcc->task->expire = TICK_ETERNITY;
}
/* Enqueue the timeout task. */
task_queue(qcc->task); task_queue(qcc->task);
leave: leave: