mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-17 09:13:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

QUIC: graph-friendly congestion control logging.

Browse Source 
Improved logging for simpler data extraction for plotting congestion
window graphs.  In particular, added current milliseconds number from
ngx_current_msec.

While here, simplified logging text and removed irrelevant data.
This commit is contained in:
Roman Arutyunyan 2025-01-03 14:49:47 +04:00 committed by Roman Arutyunyan
parent b6e7eb0f57
commit 2b8b70068a
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/event/quic/ngx_event_quic_ack.c
View File

@ -314,7 +314,7 @@ void
ngx_quic_congestion_ack(ngx_connection_t *c, ngx_quic_frame_t *f) ngx_quic_congestion_ack(ngx_connection_t *c, ngx_quic_frame_t *f)
{ {
ngx_uint_t blocked; ngx_uint_t blocked;
ngx_msec_t timer; ngx_msec_t now, timer;
ngx_quic_congestion_t *cg; ngx_quic_congestion_t *cg;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
@ -329,6 +329,8 @@ ngx_quic_congestion_ack(ngx_connection_t *c, ngx_quic_frame_t *f)
return; return;
} }
now = ngx_current_msec;
blocked = (cg->in_flight >= cg->window) ? 1 : 0; blocked = (cg->in_flight >= cg->window) ? 1 : 0;
cg->in_flight -= f->plen; cg->in_flight -= f->plen;
@ -337,8 +339,8 @@ ngx_quic_congestion_ack(ngx_connection_t *c, ngx_quic_frame_t *f)
if ((ngx_msec_int_t) timer <= 0) { if ((ngx_msec_int_t) timer <= 0) {
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic congestion ack recovery win:%uz ss:%z if:%uz", "quic congestion ack rec t:%M win:%uz if:%uz",
cg->window, cg->ssthresh, cg->in_flight); now, cg->window, cg->in_flight);
goto done; goto done;
} }
@ -346,24 +348,24 @@ ngx_quic_congestion_ack(ngx_connection_t *c, ngx_quic_frame_t *f)
if (cg->window < cg->ssthresh) { if (cg->window < cg->ssthresh) {
cg->window += f->plen; cg->window += f->plen;
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic congestion slow start win:%uz ss:%z if:%uz", "quic congestion ack ss t:%M win:%uz ss:%z if:%uz",
cg->window, cg->ssthresh, cg->in_flight); now, cg->window, cg->ssthresh, cg->in_flight);
} else { } else {
cg->window += qc->tp.max_udp_payload_size * f->plen / cg->window; cg->window += qc->tp.max_udp_payload_size * f->plen / cg->window;
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic congestion avoidance win:%uz ss:%z if:%uz", "quic congestion ack reno t:%M win:%uz if:%uz",
cg->window, cg->ssthresh, cg->in_flight); now, cg->window, cg->in_flight);
} }
/* prevent recovery_start from wrapping */ /* prevent recovery_start from wrapping */
timer = cg->recovery_start - ngx_current_msec + qc->tp.max_idle_timeout * 2; timer = cg->recovery_start - now + qc->tp.max_idle_timeout * 2;
if ((ngx_msec_int_t) timer < 0) { if ((ngx_msec_int_t) timer < 0) {
cg->recovery_start = ngx_current_msec - qc->tp.max_idle_timeout * 2; cg->recovery_start = now - qc->tp.max_idle_timeout * 2;
} }
done: done:
@ -541,17 +543,19 @@ ngx_quic_pcg_duration(ngx_connection_t *c)
static void static void
ngx_quic_persistent_congestion(ngx_connection_t *c) ngx_quic_persistent_congestion(ngx_connection_t *c)
{ {
ngx_msec_t now;
ngx_quic_congestion_t *cg; ngx_quic_congestion_t *cg;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
qc = ngx_quic_get_connection(c); qc = ngx_quic_get_connection(c);
cg = &qc->congestion; cg = &qc->congestion;
now = ngx_current_msec;
cg->recovery_start = ngx_current_msec; cg->recovery_start = now;
cg->window = qc->tp.max_udp_payload_size * 2; cg->window = qc->tp.max_udp_payload_size * 2;
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic persistent congestion win:%uz", cg->window); "quic congestion persistent t:%M win:%uz", now, cg->window);
} }
@ -659,7 +663,7 @@ static void
ngx_quic_congestion_lost(ngx_connection_t *c, ngx_quic_frame_t *f) ngx_quic_congestion_lost(ngx_connection_t *c, ngx_quic_frame_t *f)
{ {
ngx_uint_t blocked; ngx_uint_t blocked;
ngx_msec_t timer; ngx_msec_t now, timer;
ngx_quic_congestion_t *cg; ngx_quic_congestion_t *cg;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
@ -681,15 +685,17 @@ ngx_quic_congestion_lost(ngx_connection_t *c, ngx_quic_frame_t *f)
timer = f->send_time - cg->recovery_start; timer = f->send_time - cg->recovery_start;
now = ngx_current_msec;
if ((ngx_msec_int_t) timer <= 0) { if ((ngx_msec_int_t) timer <= 0) {
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic congestion lost recovery win:%uz ss:%z if:%uz", "quic congestion lost rec t:%M win:%uz if:%uz",
cg->window, cg->ssthresh, cg->in_flight); now, cg->window, cg->in_flight);
goto done; goto done;
} }
cg->recovery_start = ngx_current_msec; cg->recovery_start = now;
cg->window /= 2; cg->window /= 2;
if (cg->window < qc->tp.max_udp_payload_size * 2) { if (cg->window < qc->tp.max_udp_payload_size * 2) {
@ -699,8 +705,8 @@ ngx_quic_congestion_lost(ngx_connection_t *c, ngx_quic_frame_t *f)
cg->ssthresh = cg->window; cg->ssthresh = cg->window;
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic congestion lost win:%uz ss:%z if:%uz", "quic congestion lost t:%M win:%uz if:%uz",
cg->window, cg->ssthresh, cg->in_flight); now, cg->window, cg->in_flight);
done: done: