99 lines
3.0 KiB
C
99 lines
3.0 KiB
C
|
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
|
||
|
|
index 57af8132..4853945f 100644
|
||
|
|
--- a/src/event/ngx_event.c
|
||
|
|
+++ b/src/event/ngx_event.c
|
||
|
|
@@ -196,6 +196,9 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle)
|
||
|
|
ngx_uint_t flags;
|
||
|
|
ngx_msec_t timer, delta;
|
||
|
|
|
||
|
|
+ ngx_queue_t *q;
|
||
|
|
+ ngx_event_t *ev;
|
||
|
|
+
|
||
|
|
if (ngx_timer_resolution) {
|
||
|
|
timer = NGX_TIMER_INFINITE;
|
||
|
|
flags = 0;
|
||
|
|
@@ -215,6 +218,13 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle)
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (!ngx_queue_empty(&ngx_posted_delayed_events)) {
|
||
|
|
+ ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
||
|
|
+ "posted delayed event queue not empty"
|
||
|
|
+ " making poll timeout 0");
|
||
|
|
+ timer = 0;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
if (ngx_use_accept_mutex) {
|
||
|
|
if (ngx_accept_disabled > 0) {
|
||
|
|
ngx_accept_disabled--;
|
||
|
|
@@ -257,6 +267,35 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle)
|
||
|
|
}
|
||
|
|
|
||
|
|
ngx_event_process_posted(cycle, &ngx_posted_events);
|
||
|
|
+
|
||
|
|
+ while (!ngx_queue_empty(&ngx_posted_delayed_events)) {
|
||
|
|
+ q = ngx_queue_head(&ngx_posted_delayed_events);
|
||
|
|
+
|
||
|
|
+ ev = ngx_queue_data(q, ngx_event_t, queue);
|
||
|
|
+ if (ev->delayed) {
|
||
|
|
+ /* start of newly inserted nodes */
|
||
|
|
+ for (/* void */;
|
||
|
|
+ q != ngx_queue_sentinel(&ngx_posted_delayed_events);
|
||
|
|
+ q = ngx_queue_next(q))
|
||
|
|
+ {
|
||
|
|
+ ev = ngx_queue_data(q, ngx_event_t, queue);
|
||
|
|
+ ev->delayed = 0;
|
||
|
|
+
|
||
|
|
+ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
||
|
|
+ "skipping delayed posted event %p,"
|
||
|
|
+ " till next iteration", ev);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ break;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
||
|
|
+ "delayed posted event %p", ev);
|
||
|
|
+
|
||
|
|
+ ngx_delete_posted_event(ev);
|
||
|
|
+
|
||
|
|
+ ev->handler(ev);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
@@ -600,6 +639,7 @@ ngx_event_process_init(ngx_cycle_t *cycle)
|
||
|
|
|
||
|
|
ngx_queue_init(&ngx_posted_accept_events);
|
||
|
|
ngx_queue_init(&ngx_posted_events);
|
||
|
|
+ ngx_queue_init(&ngx_posted_delayed_events);
|
||
|
|
|
||
|
|
if (ngx_event_timer_init(cycle->log) == NGX_ERROR) {
|
||
|
|
return NGX_ERROR;
|
||
|
|
diff --git a/src/event/ngx_event_posted.c b/src/event/ngx_event_posted.c
|
||
|
|
index d851f3d1..b6cea009 100644
|
||
|
|
--- a/src/event/ngx_event_posted.c
|
||
|
|
+++ b/src/event/ngx_event_posted.c
|
||
|
|
@@ -12,6 +12,7 @@
|
||
|
|
|
||
|
|
ngx_queue_t ngx_posted_accept_events;
|
||
|
|
ngx_queue_t ngx_posted_events;
|
||
|
|
+ngx_queue_t ngx_posted_delayed_events;
|
||
|
|
|
||
|
|
|
||
|
|
void
|
||
|
|
diff --git a/src/event/ngx_event_posted.h b/src/event/ngx_event_posted.h
|
||
|
|
index 145d30fe..6c388553 100644
|
||
|
|
--- a/src/event/ngx_event_posted.h
|
||
|
|
+++ b/src/event/ngx_event_posted.h
|
||
|
|
@@ -43,6 +43,9 @@ void ngx_event_process_posted(ngx_cycle_t *cycle, ngx_queue_t *posted);
|
||
|
|
|
||
|
|
extern ngx_queue_t ngx_posted_accept_events;
|
||
|
|
extern ngx_queue_t ngx_posted_events;
|
||
|
|
+extern ngx_queue_t ngx_posted_delayed_events;
|
||
|
|
+
|
||
|
|
+#define HAVE_POSTED_DELAYED_EVENTS_PATCH
|
||
|
|
|
||
|
|
|
||
|
|
#endif /* _NGX_EVENT_POSTED_H_INCLUDED_ */
|