mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-14 12:09:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

QUIC: changed ACK frame debugging.

Browse Source 
Previously ACK ranges were logged as a gap/range sequence.  Now these
values are expanded to packet number ranges for easier reading.
This commit is contained in:
Roman Arutyunyan 2020-10-28 09:15:04 +00:00
parent a37d00064a
commit 42a4e6d311
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/event/ngx_event_quic.c
View File

@ -373,7 +373,7 @@ ngx_quic_log_frame(ngx_log_t *log, ngx_quic_frame_t *f, ngx_uint_t tx)
{ {
u_char *p, *last, *pos, *end; u_char *p, *last, *pos, *end;
ssize_t n; ssize_t n;
uint64_t gap, range; uint64_t gap, range, largest, smallest;
ngx_uint_t i; ngx_uint_t i;
u_char buf[NGX_MAX_ERROR_STR]; u_char buf[NGX_MAX_ERROR_STR];
@ -394,14 +394,22 @@ ngx_quic_log_frame(ngx_log_t *log, ngx_quic_frame_t *f, ngx_uint_t tx)
case NGX_QUIC_FT_ACK: case NGX_QUIC_FT_ACK:
case NGX_QUIC_FT_ACK_ECN: case NGX_QUIC_FT_ACK_ECN:
p = ngx_slprintf(p, last, p = ngx_slprintf(p, last, "ACK n:%ui delay:%uL ",
"ACK largest:%uL fr:%uL nranges:%ui delay:%uL",
f->u.ack.largest, f->u.ack.first_range,
f->u.ack.range_count, f->u.ack.delay); f->u.ack.range_count, f->u.ack.delay);
pos = f->u.ack.ranges_start; pos = f->u.ack.ranges_start;
end = f->u.ack.ranges_end; end = f->u.ack.ranges_end;
largest = f->u.ack.largest;
smallest = f->u.ack.largest - f->u.ack.first_range;
if (largest == smallest) {
p = ngx_slprintf(p, last, "%uL", largest);
} else {
p = ngx_slprintf(p, last, "%uL-%uL", largest, smallest);
}
for (i = 0; i < f->u.ack.range_count; i++) { for (i = 0; i < f->u.ack.range_count; i++) {
n = ngx_quic_parse_ack_range(log, pos, end, &gap, &range); n = ngx_quic_parse_ack_range(log, pos, end, &gap, &range);
if (n == NGX_ERROR) { if (n == NGX_ERROR) {
@ -410,7 +418,15 @@ ngx_quic_log_frame(ngx_log_t *log, ngx_quic_frame_t *f, ngx_uint_t tx)
pos += n; pos += n;
p = ngx_slprintf(p, last, " %uL,%uL", gap, range); largest = smallest - gap - 2;
smallest = largest - range;
if (largest == smallest) {
p = ngx_slprintf(p, last, " %uL", largest);
} else {
p = ngx_slprintf(p, last, " %uL-%uL", largest, smallest);
}
} }
if (f->type == NGX_QUIC_FT_ACK_ECN) { if (f->type == NGX_QUIC_FT_ACK_ECN) {
@ -3107,9 +3123,6 @@ ngx_quic_handle_ack_frame_range(ngx_connection_t *c, ngx_quic_send_ctx_t *ctx,
ngx_quic_frame_t *f; ngx_quic_frame_t *f;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic handle ack range min:%uL max:%uL", min, max);
qc = c->quic; qc = c->quic;
*send_time = NGX_TIMER_INFINITE; *send_time = NGX_TIMER_INFINITE;