commit a6717c4e59a24bb11dab29b12fb9851bb41293c0
author Igor Sysoev <igor@sysoev.ru> Mon Dec 23 06:29:22 2002 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon Dec 23 06:29:22 2002 +0000
tree 3752e2a2fa8f5097b43d946b5b43e4aa90fbe98c
parent 41d5a4f2ae515a62008d22997c431ff54cfc7500

nginx-0.0.1-2002-12-23-09:29:22 import

src/event/ngx_event.c

diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index c2e10ae..3cb070c 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -12,6 +12,9 @@
 #include <ngx_event_accept.h>
 
 #include <ngx_select_module.h>
+#if (HAVE_POLL)
+#include <ngx_poll_module.h>
+#endif
 #if (HAVE_KQUEUE)
 #include <ngx_kqueue_module.h>
 #endif
@@ -23,11 +26,15 @@
 #if !(USE_KQUEUE)
 
 #if (HAVE_KQUEUE)
-#if 1
+
+#if 0
 ngx_event_type_e     ngx_event_type = NGX_SELECT_EVENT;
+#elif 1
+ngx_event_type_e     ngx_event_type = NGX_POLL_EVENT;
 #else
 ngx_event_type_e     ngx_event_type = NGX_KQUEUE_EVENT;
 #endif
+
 #else
 ngx_event_type_e     ngx_event_type = NGX_SELECT_EVENT;
 #endif
@@ -51,7 +58,10 @@
 void ngx_pre_thread(ngx_array_t *ls, ngx_pool_t *pool, ngx_log_t *log)
 {
     int  i, fd;
-    ngx_listen_t *s;
+
+    ngx_listen_t      *s;
+    ngx_event_t       *ev;
+    ngx_connection_t  *c;
 
     /* STUB */
     int max_connections = 512;
@@ -70,6 +80,9 @@
 
         fd = s[i].fd;
 
+        c = &ngx_connections[fd];
+        ev = &ngx_read_events[fd];
+
         ngx_memzero(&ngx_connections[fd], sizeof(ngx_connection_t));
         ngx_memzero(&ngx_read_events[fd], sizeof(ngx_event_t));
 
@@ -89,6 +102,7 @@
                       ngx_palloc(pool, sizeof(ngx_log_t)), /* void */ ; );
         ngx_memcpy(ngx_read_events[fd].log, ngx_connections[fd].log,
                    sizeof(ngx_log_t));
+        c->read = ev;
         ngx_read_events[fd].data = &ngx_connections[fd];
         ngx_read_events[fd].event_handler = &ngx_event_accept;
         ngx_read_events[fd].listening = 1;