Mercurial > hg > nginx

comparison src/event/ngx_event.h @ 5820:3377f9459e99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Events: removed broken thread support from posted events. It's mostly dead code. And the idea of thread support for this task has been deprecated.
author Valentin Bartenev <vbart@nginx.com>
date Mon, 01 Sep 2014 18:20:03 +0400
parents 36b58ddb566d
children 3f5f0ab59b35
comparison
equal deleted inserted replaced
5819:8e7ee4c70a3c 5820:3377f9459e99
71 71
72 unsigned deferred_accept:1; 72 unsigned deferred_accept:1;
73 73
74 /* the pending eof reported by kqueue, epoll or in aio chain operation */ 74 /* the pending eof reported by kqueue, epoll or in aio chain operation */
75 unsigned pending_eof:1; 75 unsigned pending_eof:1;
76
77 #if !(NGX_THREADS)
78 unsigned posted_ready:1;
79 #endif
80 76
81 #if (NGX_WIN32) 77 #if (NGX_WIN32)
82 /* setsockopt(SO_UPDATE_ACCEPT_CONTEXT) was successful */ 78 /* setsockopt(SO_UPDATE_ACCEPT_CONTEXT) was successful */
83 unsigned accept_context_updated:1; 79 unsigned accept_context_updated:1;
84 #endif 80 #endif
133 129
134 /* to test on worker exit */ 130 /* to test on worker exit */
135 unsigned channel:1; 131 unsigned channel:1;
136 unsigned resolver:1; 132 unsigned resolver:1;
137 133
138 #if (NGX_THREADS)
139
140 unsigned locked:1;
141
142 unsigned posted_ready:1;
143 unsigned posted_timedout:1;
144 unsigned posted_eof:1;
145
146 #if (NGX_HAVE_KQUEUE)
147 /* the pending errno reported by kqueue */
148 int posted_errno;
149 #endif
150
151 #if (NGX_HAVE_KQUEUE) || (NGX_HAVE_IOCP)
152 int posted_available;
153 #else
154 unsigned posted_available:1;
155 #endif
156
157 ngx_atomic_t *lock;
158 ngx_atomic_t *own_lock;
159
160 #endif
161
162 /* the links of the posted queue */ 134 /* the links of the posted queue */
163 ngx_event_t *next; 135 ngx_event_t *next;
164 ngx_event_t **prev; 136 ngx_event_t **prev;
165 137
166 138
517 #endif 489 #endif
518 490
519 491
520 #define NGX_UPDATE_TIME 1 492 #define NGX_UPDATE_TIME 1
521 #define NGX_POST_EVENTS 2 493 #define NGX_POST_EVENTS 2
522 #define NGX_POST_THREAD_EVENTS 4
523 494
524 495
525 extern sig_atomic_t ngx_event_timer_alarm; 496 extern sig_atomic_t ngx_event_timer_alarm;
526 extern ngx_uint_t ngx_event_flags; 497 extern ngx_uint_t ngx_event_flags;
527 extern ngx_module_t ngx_events_module; 498 extern ngx_module_t ngx_events_module;