diff options
| -rw-r--r-- | src/event/ngx_event.c | 2 | ||||
| -rw-r--r-- | src/event/ngx_event_openssl.c | 4 | ||||
| -rw-r--r-- | src/event/ngx_event_posted.c | 22 | ||||
| -rw-r--r-- | src/event/ngx_event_posted.h | 2 |
4 files changed, 16 insertions, 14 deletions
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index 54ab605e3..402a7f5e2 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -238,6 +238,7 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle) } if (!ngx_queue_empty(&ngx_posted_next_events)) { + ngx_event_move_posted_next(cycle); timer = 0; } @@ -261,7 +262,6 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle) } ngx_event_process_posted(cycle, &ngx_posted_events); - ngx_event_process_posted_next(cycle, &ngx_posted_next_events); } diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index 6a0e8c0ad..91b415caa 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -2017,6 +2017,10 @@ ngx_ssl_recv(ngx_connection_t *c, u_char *buf, size_t size) c->read->available = 0; c->read->ready = 0; + if (c->read->posted) { + ngx_delete_posted_event(c->read); + } + ngx_post_event(c->read, &ngx_posted_next_events); } diff --git a/src/event/ngx_event_posted.c b/src/event/ngx_event_posted.c index 125bf4c67..fa575bd87 100644 --- a/src/event/ngx_event_posted.c +++ b/src/event/ngx_event_posted.c @@ -37,26 +37,24 @@ ngx_event_process_posted(ngx_cycle_t *cycle, ngx_queue_t *posted) void -ngx_event_process_posted_next(ngx_cycle_t *cycle, ngx_queue_t *posted) +ngx_event_move_posted_next(ngx_cycle_t *cycle) { ngx_queue_t *q; ngx_event_t *ev; - while (!ngx_queue_empty(posted)) { - - q = ngx_queue_head(posted); + for (q = ngx_queue_head(&ngx_posted_next_events); + q != ngx_queue_sentinel(&ngx_posted_next_events); + q = ngx_queue_next(q)) + { ev = ngx_queue_data(q, ngx_event_t, queue); ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "posted next event %p", ev); - ngx_delete_posted_event(ev); - - if (!ev->ready) { - ev->ready = 1; - ev->available = -1; - } - - ev->handler(ev); + ev->ready = 1; + ev->available = -1; } + + ngx_queue_add(&ngx_posted_events, &ngx_posted_next_events); + ngx_queue_init(&ngx_posted_next_events); } diff --git a/src/event/ngx_event_posted.h b/src/event/ngx_event_posted.h index de0a80454..b1a85c442 100644 --- a/src/event/ngx_event_posted.h +++ b/src/event/ngx_event_posted.h @@ -39,7 +39,7 @@ void ngx_event_process_posted(ngx_cycle_t *cycle, ngx_queue_t *posted); -void ngx_event_process_posted_next(ngx_cycle_t *cycle, ngx_queue_t *posted); +void ngx_event_move_posted_next(ngx_cycle_t *cycle); extern ngx_queue_t ngx_posted_accept_events; |