summaryrefslogtreecommitdiffhomepage
path: root/src/event/ngx_event.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/event/ngx_event.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 98a351c5b..7437ad7a5 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -51,6 +51,7 @@ struct ngx_event_s {
unsigned listening:1;
unsigned write:1;
+ unsigned active:1;
unsigned ready:1;
unsigned timedout:1;
unsigned blocked:1;
@@ -74,6 +75,9 @@ typedef enum {
#if (HAVE_POLL)
NGX_POLL_EVENT,
#endif
+#if (HAVE_DEVPOLL)
+ NGX_DEVPOLL_EVENT,
+#endif
#if (HAVE_KQUEUE)
NGX_KQUEUE_EVENT,
#endif
@@ -120,7 +124,7 @@ NGX_CLOSE_EVENT kqueue: kqueue deletes events for file that closed
#define NGX_CLEAR_EVENT EV_CLEAR
#endif
-#elif (HAVE_POLL)
+#elif (HAVE_POLL) || (HAVE_DEVPOLL)
#define NGX_READ_EVENT POLLIN
#define NGX_WRITE_EVENT POLLOUT
@@ -159,9 +163,10 @@ NGX_CLOSE_EVENT kqueue: kqueue deletes events for file that closed
#endif
-static void ngx_inline ngx_del_timer(ngx_event_t *ev)
+ngx_inline static void ngx_del_timer(ngx_event_t *ev)
{
-#if (NGX_DEBUG)
+#if (NGX_DEBUG_EVENT)
+ /* STUB - we can not cast (ngx_connection_t *) here */
ngx_log_debug(ev->log, "del timer: %d" _ *(int *)(ev->data));
#endif