Mercurial > hg > nginx

comparison src/event/ngx_event_posted.c @ 7617:f1720934c45b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SSL: reworked posted next events again. Previous change 1ce3f01a4355 incorrectly introduced processing of the ngx_posted_next_events queue at the end of operation, effectively making posted next events a nop, since at the end of an event loop iteration the queue is always empty. Correct approach is to move events to the ngx_posted_events queue at an iteration start, as it was done previously. Further, in some cases the c->read event might be already in the ngx_posted_events queue, and calling ngx_post_event() with the ngx_posted_next_events queue won't do anything. To make sure the event will be correctly placed into the ngx_posted_next_events queue we now check if it is already posted.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 27 Dec 2019 19:43:01 +0300
parents 1ce3f01a4355
children
comparison
equal deleted inserted replaced
7616:fd4d2155d3e6 7617:f1720934c45b
35 } 35 }
36 } 36 }
37 37
38 38
39 void 39 void
40 ngx_event_process_posted_next(ngx_cycle_t *cycle, ngx_queue_t *posted) 40 ngx_event_move_posted_next(ngx_cycle_t *cycle)
41 { 41 {
42 ngx_queue_t *q; 42 ngx_queue_t *q;
43 ngx_event_t *ev; 43 ngx_event_t *ev;
44 44
45 while (!ngx_queue_empty(posted)) { 45 for (q = ngx_queue_head(&ngx_posted_next_events);
46 46 q != ngx_queue_sentinel(&ngx_posted_next_events);
47 q = ngx_queue_head(posted); 47 q = ngx_queue_next(q))
48 {
48 ev = ngx_queue_data(q, ngx_event_t, queue); 49 ev = ngx_queue_data(q, ngx_event_t, queue);
49 50
50 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, 51 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
51 "posted next event %p", ev); 52 "posted next event %p", ev);
52 53
53 ngx_delete_posted_event(ev); 54 ev->ready = 1;
55 ev->available = -1;
56 }
54 57
55 if (!ev->ready) { 58 ngx_queue_add(&ngx_posted_events, &ngx_posted_next_events);
56 ev->ready = 1; 59 ngx_queue_init(&ngx_posted_next_events);
57 ev->available = -1;
58 }
59
60 ev->handler(ev);
61 }
62 } 60 }