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

QUIC: stream event setting function.

Browse Source 
The function ngx_quic_set_event() is now called instead of posting events
directly.
This commit is contained in:
Roman Arutyunyan 2022-01-26 12:01:31 +03:00
parent ca92231bf0
commit 1491d6ec42
1 changed files with 21 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/event/quic/ngx_event_quic_streams.c
View File

@ -34,6 +34,7 @@ static ngx_int_t ngx_quic_control_flow(ngx_connection_t *c, uint64_t last);
static ngx_int_t ngx_quic_update_flow(ngx_connection_t *c, uint64_t last); static ngx_int_t ngx_quic_update_flow(ngx_connection_t *c, uint64_t last);
static ngx_int_t ngx_quic_update_max_stream_data(ngx_connection_t *c); static ngx_int_t ngx_quic_update_max_stream_data(ngx_connection_t *c);
static ngx_int_t ngx_quic_update_max_data(ngx_connection_t *c); static ngx_int_t ngx_quic_update_max_data(ngx_connection_t *c);
static void ngx_quic_set_event(ngx_event_t *ev);
ngx_connection_t * ngx_connection_t *
@ -156,7 +157,6 @@ ngx_quic_close_streams(ngx_connection_t *c, ngx_quic_connection_t *qc)
{ {
ngx_pool_t *pool; ngx_pool_t *pool;
ngx_queue_t *q; ngx_queue_t *q;
ngx_event_t *rev, *wev;
ngx_rbtree_t *tree; ngx_rbtree_t *tree;
ngx_rbtree_node_t *node; ngx_rbtree_node_t *node;
ngx_quic_stream_t *qs; ngx_quic_stream_t *qs;
@ -195,17 +195,8 @@ ngx_quic_close_streams(ngx_connection_t *c, ngx_quic_connection_t *qc)
qs->recv_state = NGX_QUIC_STREAM_RECV_RESET_RECVD; qs->recv_state = NGX_QUIC_STREAM_RECV_RESET_RECVD;
qs->send_state = NGX_QUIC_STREAM_SEND_RESET_SENT; qs->send_state = NGX_QUIC_STREAM_SEND_RESET_SENT;
rev = qs->connection->read; ngx_quic_set_event(qs->connection->read);
rev->ready = 1; ngx_quic_set_event(qs->connection->write);
wev = qs->connection->write;
wev->ready = 1;
ngx_post_event(rev, &ngx_posted_events);
if (rev->timer_set) {
ngx_del_timer(rev);
}
#if (NGX_DEBUG) #if (NGX_DEBUG)
ns++; ns++;
@ -1028,7 +1019,6 @@ ngx_quic_handle_stream_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
ngx_quic_frame_t *frame) ngx_quic_frame_t *frame)
{ {
uint64_t last; uint64_t last;
ngx_event_t *rev;
ngx_connection_t *sc; ngx_connection_t *sc;
ngx_quic_stream_t *qs; ngx_quic_stream_t *qs;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
@ -1106,12 +1096,7 @@ ngx_quic_handle_stream_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
} }
if (f->offset == qs->recv_offset) { if (f->offset == qs->recv_offset) {
rev = sc->read; ngx_quic_set_event(sc->read);
rev->ready = 1;
if (rev->active) {
ngx_post_event(rev, &ngx_posted_events);
}
} }
return NGX_OK; return NGX_OK;
@ -1122,7 +1107,6 @@ ngx_int_t
ngx_quic_handle_max_data_frame(ngx_connection_t *c, ngx_quic_handle_max_data_frame(ngx_connection_t *c,
ngx_quic_max_data_frame_t *f) ngx_quic_max_data_frame_t *f)
{ {
ngx_event_t *wev;
ngx_rbtree_t *tree; ngx_rbtree_t *tree;
ngx_rbtree_node_t *node; ngx_rbtree_node_t *node;
ngx_quic_stream_t *qs; ngx_quic_stream_t *qs;
@ -1144,12 +1128,7 @@ ngx_quic_handle_max_data_frame(ngx_connection_t *c,
node = ngx_rbtree_next(tree, node)) node = ngx_rbtree_next(tree, node))
{ {
qs = (ngx_quic_stream_t *) node; qs = (ngx_quic_stream_t *) node;
wev = qs->connection->write; ngx_quic_set_event(qs->connection->write);
if (wev->active) {
wev->ready = 1;
ngx_post_event(wev, &ngx_posted_events);
}
} }
} }
@ -1210,7 +1189,6 @@ ngx_quic_handle_max_stream_data_frame(ngx_connection_t *c,
ngx_quic_header_t *pkt, ngx_quic_max_stream_data_frame_t *f) ngx_quic_header_t *pkt, ngx_quic_max_stream_data_frame_t *f)
{ {
uint64_t sent; uint64_t sent;
ngx_event_t *wev;
ngx_quic_stream_t *qs; ngx_quic_stream_t *qs;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
@ -1240,12 +1218,7 @@ ngx_quic_handle_max_stream_data_frame(ngx_connection_t *c,
sent = qs->connection->sent; sent = qs->connection->sent;
if (sent >= qs->send_max_data) { if (sent >= qs->send_max_data) {
wev = qs->connection->write; ngx_quic_set_event(qs->connection->write);
if (wev->active) {
wev->ready = 1;
ngx_post_event(wev, &ngx_posted_events);
}
} }
qs->send_max_data = f->limit; qs->send_max_data = f->limit;
@ -1258,7 +1231,6 @@ ngx_int_t
ngx_quic_handle_reset_stream_frame(ngx_connection_t *c, ngx_quic_handle_reset_stream_frame(ngx_connection_t *c,
ngx_quic_header_t *pkt, ngx_quic_reset_stream_frame_t *f) ngx_quic_header_t *pkt, ngx_quic_reset_stream_frame_t *f)
{ {
ngx_event_t *rev;
ngx_connection_t *sc; ngx_connection_t *sc;
ngx_quic_stream_t *qs; ngx_quic_stream_t *qs;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
@ -1312,12 +1284,7 @@ ngx_quic_handle_reset_stream_frame(ngx_connection_t *c,
return NGX_ERROR; return NGX_ERROR;
} }
rev = sc->read; ngx_quic_set_event(qs->connection->read);
rev->ready = 1;
if (rev->active) {
ngx_post_event(rev, &ngx_posted_events);
}
return NGX_OK; return NGX_OK;
} }
@ -1327,7 +1294,6 @@ ngx_int_t
ngx_quic_handle_stop_sending_frame(ngx_connection_t *c, ngx_quic_handle_stop_sending_frame(ngx_connection_t *c,
ngx_quic_header_t *pkt, ngx_quic_stop_sending_frame_t *f) ngx_quic_header_t *pkt, ngx_quic_stop_sending_frame_t *f)
{ {
ngx_event_t *wev;
ngx_quic_stream_t *qs; ngx_quic_stream_t *qs;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
@ -1354,12 +1320,7 @@ ngx_quic_handle_stop_sending_frame(ngx_connection_t *c,
return NGX_ERROR; return NGX_ERROR;
} }
wev = qs->connection->write; ngx_quic_set_event(qs->connection->write);
if (wev->active) {
wev->ready = 1;
ngx_post_event(wev, &ngx_posted_events);
}
return NGX_OK; return NGX_OK;
} }
@ -1398,7 +1359,6 @@ void
ngx_quic_handle_stream_ack(ngx_connection_t *c, ngx_quic_frame_t *f) ngx_quic_handle_stream_ack(ngx_connection_t *c, ngx_quic_frame_t *f)
{ {
uint64_t sent, unacked; uint64_t sent, unacked;
ngx_event_t *wev;
ngx_quic_stream_t *qs; ngx_quic_stream_t *qs;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
@ -1409,13 +1369,11 @@ ngx_quic_handle_stream_ack(ngx_connection_t *c, ngx_quic_frame_t *f)
return; return;
} }
wev = qs->connection->write;
sent = qs->connection->sent; sent = qs->connection->sent;
unacked = sent - qs->acked; unacked = sent - qs->acked;
if (unacked >= qc->conf->stream_buffer_size && wev->active) { if (unacked >= qc->conf->stream_buffer_size) {
wev->ready = 1; ngx_quic_set_event(qs->connection->write);
ngx_post_event(wev, &ngx_posted_events);
} }
qs->acked += f->u.stream.length; qs->acked += f->u.stream.length;
@ -1589,6 +1547,17 @@ ngx_quic_update_max_data(ngx_connection_t *c)
} }
static void
ngx_quic_set_event(ngx_event_t *ev)
{
ev->ready = 1;
if (ev->active) {
ngx_post_event(ev, &ngx_posted_events);
}
}
ngx_int_t ngx_int_t
ngx_quic_handle_read_event(ngx_event_t *rev, ngx_uint_t flags) ngx_quic_handle_read_event(ngx_event_t *rev, ngx_uint_t flags)
{ {