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

QUIC: ngx_quic_frame_t time fields cleanup.

Browse Source 
The field "first" is removed.  It's unused since 909b989ec088.
The field "last" is renamed to "send_time".  It holds frame send time.
This commit is contained in:
Roman Arutyunyan 2023-11-30 15:03:06 +04:00
parent ccca701dc6
commit 209e8bc0c0
3 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -265,16 +265,16 @@ ngx_quic_handle_ack_frame_range(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
} }
if (f->pnum == max) { if (f->pnum == max) {
st->max_pn = f->last; st->max_pn = f->send_time;
} }
/* save earliest and latest send times of frames ack'ed */ /* save earliest and latest send times of frames ack'ed */
if (st->oldest == NGX_TIMER_INFINITE || f->last < st->oldest) { if (st->oldest == NGX_TIMER_INFINITE || f->send_time < st->oldest) {
st->oldest = f->last; st->oldest = f->send_time;
} }
if (st->newest == NGX_TIMER_INFINITE || f->last > st->newest) { if (st->newest == NGX_TIMER_INFINITE || f->send_time > st->newest) {
st->newest = f->last; st->newest = f->send_time;
} }
ngx_queue_remove(&f->queue); ngx_queue_remove(&f->queue);
@ -329,7 +329,7 @@ ngx_quic_congestion_ack(ngx_connection_t *c, ngx_quic_frame_t *f)
cg->in_flight -= f->plen; cg->in_flight -= f->plen;
timer = f->last - cg->recovery_start; timer = f->send_time - cg->recovery_start;
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,
@ -465,7 +465,7 @@ ngx_quic_detect_lost(ngx_connection_t *c, ngx_quic_ack_stat_t *st)
break; break;
} }
wait = start->last + thr - now; wait = start->send_time + thr - now;
ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic detect_lost pnum:%uL thr:%M wait:%i level:%d", "quic detect_lost pnum:%uL thr:%M wait:%i level:%d",
@ -477,14 +477,14 @@ ngx_quic_detect_lost(ngx_connection_t *c, ngx_quic_ack_stat_t *st)
break; break;
} }
if (start->last > qc->first_rtt) { if (start->send_time > qc->first_rtt) {
if (oldest == NGX_TIMER_INFINITE || start->last < oldest) { if (oldest == NGX_TIMER_INFINITE || start->send_time < oldest) {
oldest = start->last; oldest = start->send_time;
} }
if (newest == NGX_TIMER_INFINITE || start->last > newest) { if (newest == NGX_TIMER_INFINITE || start->send_time > newest) {
newest = start->last; newest = start->send_time;
} }
nlost++; nlost++;
@ -672,7 +672,7 @@ ngx_quic_congestion_lost(ngx_connection_t *c, ngx_quic_frame_t *f)
cg->in_flight -= f->plen; cg->in_flight -= f->plen;
f->plen = 0; f->plen = 0;
timer = f->last - cg->recovery_start; timer = f->send_time - cg->recovery_start;
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,
@ -730,7 +730,8 @@ ngx_quic_set_lost_timer(ngx_connection_t *c)
if (ctx->largest_ack != NGX_QUIC_UNSET_PN) { if (ctx->largest_ack != NGX_QUIC_UNSET_PN) {
q = ngx_queue_head(&ctx->sent); q = ngx_queue_head(&ctx->sent);
f = ngx_queue_data(q, ngx_quic_frame_t, queue); f = ngx_queue_data(q, ngx_quic_frame_t, queue);
w = (ngx_msec_int_t) (f->last + ngx_quic_lost_threshold(qc) - now); w = (ngx_msec_int_t)
(f->send_time + ngx_quic_lost_threshold(qc) - now);
if (f->pnum <= ctx->largest_ack) { if (f->pnum <= ctx->largest_ack) {
if (w < 0 || ctx->largest_ack - f->pnum >= NGX_QUIC_PKT_THR) { if (w < 0 || ctx->largest_ack - f->pnum >= NGX_QUIC_PKT_THR) {
@ -745,8 +746,8 @@ ngx_quic_set_lost_timer(ngx_connection_t *c)
q = ngx_queue_last(&ctx->sent); q = ngx_queue_last(&ctx->sent);
f = ngx_queue_data(q, ngx_quic_frame_t, queue); f = ngx_queue_data(q, ngx_quic_frame_t, queue);
w = (ngx_msec_int_t) (f->last + (ngx_quic_pto(c, ctx) << qc->pto_count) w = (ngx_msec_int_t)
- now); (f->send_time + (ngx_quic_pto(c, ctx) << qc->pto_count) - now);
if (w < 0) { if (w < 0) {
w = 0; w = 0;
@ -828,6 +829,7 @@ ngx_quic_pto_handler(ngx_event_t *ev)
ngx_uint_t i, n; ngx_uint_t i, n;
ngx_msec_t now; ngx_msec_t now;
ngx_queue_t *q; ngx_queue_t *q;
ngx_msec_int_t w;
ngx_connection_t *c; ngx_connection_t *c;
ngx_quic_frame_t *f; ngx_quic_frame_t *f;
ngx_quic_send_ctx_t *ctx; ngx_quic_send_ctx_t *ctx;
@ -849,6 +851,8 @@ ngx_quic_pto_handler(ngx_event_t *ev)
q = ngx_queue_last(&ctx->sent); q = ngx_queue_last(&ctx->sent);
f = ngx_queue_data(q, ngx_quic_frame_t, queue); f = ngx_queue_data(q, ngx_quic_frame_t, queue);
w = (ngx_msec_int_t)
(f->send_time + (ngx_quic_pto(c, ctx) << qc->pto_count) - now);
if (f->pnum <= ctx->largest_ack if (f->pnum <= ctx->largest_ack
&& ctx->largest_ack != NGX_QUIC_UNSET_PN) && ctx->largest_ack != NGX_QUIC_UNSET_PN)
@ -856,9 +860,7 @@ ngx_quic_pto_handler(ngx_event_t *ev)
continue; continue;
} }
if ((ngx_msec_int_t) (f->last + (ngx_quic_pto(c, ctx) << qc->pto_count) if (w > 0) {
- now) > 0)
{
continue; continue;
} }

6
src/event/quic/ngx_event_quic_output.c
View File

@ -586,8 +586,7 @@ ngx_quic_output_packet(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
} }
f->pnum = ctx->pnum; f->pnum = ctx->pnum;
f->first = now; f->send_time = now;
f->last = now;
f->plen = 0; f->plen = 0;
ngx_quic_log_frame(c->log, f, 1); ngx_quic_log_frame(c->log, f, 1);
@ -1265,8 +1264,7 @@ ngx_quic_frame_sendto(ngx_connection_t *c, ngx_quic_frame_t *frame,
} }
frame->pnum = ctx->pnum; frame->pnum = ctx->pnum;
frame->first = now; frame->send_time = now;
frame->last = now;
frame->plen = res.len; frame->plen = res.len;
ctx->pnum++; ctx->pnum++;

3
src/event/quic/ngx_event_quic_transport.h
View File

@ -266,8 +266,7 @@ struct ngx_quic_frame_s {
ngx_queue_t queue; ngx_queue_t queue;
uint64_t pnum; uint64_t pnum;
size_t plen; size_t plen;
ngx_msec_t first; ngx_msec_t send_time;
ngx_msec_t last;
ssize_t len; ssize_t len;
unsigned need_ack:1; unsigned need_ack:1;
unsigned pkt_need_ack:1; unsigned pkt_need_ack:1;