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

Advertizing MAX_STREAMS (0x12) credit in advance.

Browse Source 
This makes sending large number of bidirectional stream work within ngtcp2,
which doesn't bother sending optional STREAMS_BLOCKED when exhausted.

This also introduces tracking currently opened and maximum allowed streams.
This commit is contained in:
Sergey Kandaurov 2020-04-03 13:49:44 +03:00
parent 569da72e4b
commit b4719e8ea4
1 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/event/ngx_event_quic.c
View File

@ -22,6 +22,9 @@
#define NGX_QUIC_NAMESPACE_LAST (NGX_QUIC_ENCRYPTION_LAST - 1) #define NGX_QUIC_NAMESPACE_LAST (NGX_QUIC_ENCRYPTION_LAST - 1)
#define NGX_QUIC_STREAMS_INC 16
#define NGX_QUIC_STREAMS_LIMIT (1ULL < 60)
typedef enum { typedef enum {
NGX_QUIC_ST_INITIAL, /* connection just created */ NGX_QUIC_ST_INITIAL, /* connection just created */
@ -80,6 +83,9 @@ struct ngx_quic_connection_s {
ngx_quic_streams_t streams; ngx_quic_streams_t streams;
ngx_uint_t max_data; ngx_uint_t max_data;
uint64_t cur_streams;
uint64_t max_streams;
unsigned send_timer_set:1; unsigned send_timer_set:1;
unsigned closing:1; unsigned closing:1;
}; };
@ -130,6 +136,7 @@ static ngx_int_t ngx_quic_handle_crypto_frame(ngx_connection_t *c,
ngx_quic_header_t *pkt, ngx_quic_crypto_frame_t *frame); ngx_quic_header_t *pkt, ngx_quic_crypto_frame_t *frame);
static ngx_int_t ngx_quic_handle_stream_frame(ngx_connection_t *c, static ngx_int_t ngx_quic_handle_stream_frame(ngx_connection_t *c,
ngx_quic_header_t *pkt, ngx_quic_stream_frame_t *frame); ngx_quic_header_t *pkt, ngx_quic_stream_frame_t *frame);
static ngx_int_t ngx_quic_handle_max_streams(ngx_connection_t *c);
static ngx_int_t ngx_quic_handle_streams_blocked_frame(ngx_connection_t *c, static ngx_int_t ngx_quic_handle_streams_blocked_frame(ngx_connection_t *c,
ngx_quic_header_t *pkt, ngx_quic_streams_blocked_frame_t *f); ngx_quic_header_t *pkt, ngx_quic_streams_blocked_frame_t *f);
static ngx_int_t ngx_quic_handle_stream_data_blocked_frame(ngx_connection_t *c, static ngx_int_t ngx_quic_handle_stream_data_blocked_frame(ngx_connection_t *c,
@ -582,6 +589,7 @@ ngx_quic_init_connection(ngx_connection_t *c)
return NGX_ERROR; return NGX_ERROR;
} }
qc->max_streams = qc->tp.initial_max_streams_bidi;
qc->state = NGX_QUIC_ST_HANDSHAKE; qc->state = NGX_QUIC_ST_HANDSHAKE;
n = SSL_do_handshake(ssl_conn); n = SSL_do_handshake(ssl_conn);
@ -1400,12 +1408,53 @@ ngx_quic_handle_stream_frame(ngx_connection_t *c,
rev->pending_eof = 1; rev->pending_eof = 1;
} }
if ((f->stream_id & NGX_QUIC_STREAM_UNIDIRECTIONAL) == 0) {
ngx_quic_handle_max_streams(c);
}
qc->streams.handler(sn->c); qc->streams.handler(sn->c);
return NGX_OK; return NGX_OK;
} }
static ngx_int_t
ngx_quic_handle_max_streams(ngx_connection_t *c)
{
ngx_quic_frame_t *frame;
ngx_quic_connection_t *qc;
qc = c->quic;
qc->cur_streams++;
if (qc->cur_streams + NGX_QUIC_STREAMS_INC / 2 < qc->max_streams) {
return NGX_OK;
}
frame = ngx_quic_alloc_frame(c, 0);
if (frame == NULL) {
return NGX_ERROR;
}
qc->max_streams = ngx_max(qc->max_streams + NGX_QUIC_STREAMS_INC,
NGX_QUIC_STREAMS_LIMIT);
frame->level = ssl_encryption_application;
frame->type = NGX_QUIC_FT_MAX_STREAMS;
frame->u.max_streams.limit = qc->max_streams;
frame->u.max_streams.bidi = 1;
ngx_sprintf(frame->info, "MAX_STREAMS limit:%d bidi:%d level=%d",
(int) frame->u.max_streams.limit,
(int) frame->u.max_streams.bidi,
frame->level);
ngx_quic_queue_frame(qc, frame);
return NGX_OK;
}
static ngx_int_t static ngx_int_t
ngx_quic_handle_streams_blocked_frame(ngx_connection_t *c, ngx_quic_handle_streams_blocked_frame(ngx_connection_t *c,
ngx_quic_header_t *pkt, ngx_quic_streams_blocked_frame_t *f) ngx_quic_header_t *pkt, ngx_quic_streams_blocked_frame_t *f)
@ -1419,9 +1468,11 @@ ngx_quic_handle_streams_blocked_frame(ngx_connection_t *c,
frame->level = pkt->level; frame->level = pkt->level;
frame->type = NGX_QUIC_FT_MAX_STREAMS; frame->type = NGX_QUIC_FT_MAX_STREAMS;
frame->u.max_streams.limit = f->limit * 2; frame->u.max_streams.limit = ngx_max(f->limit * 2, NGX_QUIC_STREAMS_LIMIT);
frame->u.max_streams.bidi = f->bidi; frame->u.max_streams.bidi = f->bidi;
c->quic->max_streams = frame->u.max_streams.limit;
ngx_sprintf(frame->info, "MAX_STREAMS limit:%d bidi:%d level=%d", ngx_sprintf(frame->info, "MAX_STREAMS limit:%d bidi:%d level=%d",
(int) frame->u.max_streams.limit, (int) frame->u.max_streams.limit,
(int) frame->u.max_streams.bidi, (int) frame->u.max_streams.bidi,