nginx-0.0.2-2004-02-09-10:46:43 import

4 files changed, 18 insertions, 11 deletions

diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c
index bf3320439..3f46a83ad 100644
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -202,11 +202,11 @@ static int ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags)
     }
 #endif
 
-    ee.events = event;
+    ee.events = event|EPOLLET;
     ee.data.ptr = (void *) ((uintptr_t) c | c->read->instance);
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                   "epoll add event: fd:%d ev:%04X", c->fd, ee.events);
+                   "epoll add event: fd:%d ev:%08X", c->fd, ee.events);
 
     if (epoll_ctl(ep, EPOLL_CTL_ADD, c->fd, &ee) == -1) {
         ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
@@ -230,8 +230,8 @@ static int ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags)
     ee.events = 0;
     ee.data.ptr = NULL;
 
-    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                   "epoll del event: fd:%d ev:%04X", c->fd, ee.events);
+    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                   "epoll del event: fd:%d", c->fd);
 
     if (epoll_ctl(ep, EPOLL_CTL_DEL, c->fd, &ee) == -1) {
         ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
@@ -249,11 +249,11 @@ static int ngx_epoll_add_connection(ngx_connection_t *c)
 {
     struct epoll_event  ee;
 
-    ee.events = EPOLLIN|EPOLLOUT;
+    ee.events = EPOLLIN|EPOLLOUT|EPOLLET;
     ee.data.ptr = (void *) ((uintptr_t) c | c->read->instance);
 
     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
-                   "epoll add connection: fd:%d ev:%04X", c->fd, ee.events);
+                   "epoll add connection: fd:%d ev:%08X", c->fd, ee.events);
 
     if (epoll_ctl(ep, EPOLL_CTL_ADD, c->fd, &ee) == -1) {
         ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
@@ -355,9 +355,9 @@ int ngx_epoll_process_events(ngx_log_t *log)
         }
 
         if (event_list[i].events & (EPOLLERR|EPOLLHUP)) {
-            ngx_log_error(NGX_LOG_ALERT, log, 0,
-                          "epoll_wait() error on fd:%d ev:%d",
-                          c->fd, event_list[i].events);
+            ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0,
+                           "epoll_wait() error on fd:%d ev:%04X",
+                           c->fd, event_list[i].events);
         }
 
         if (event_list[i].events & ~(EPOLLIN|EPOLLOUT|EPOLLERR|EPOLLHUP)) {
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index 96d1fc7b4..dfc66cb76 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -286,7 +286,8 @@ static int ngx_poll_process_events(ngx_log_t *log)
     delta = ngx_elapsed_msec;
     ngx_elapsed_msec = tv.tv_sec * 1000 + tv.tv_usec / 1000 - ngx_start_msec;
 
-    ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0, "poll ready %d", ready);
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0,
+                   "poll ready %d of %d", ready, nevents);
 
     if (err) {
         ngx_log_error((err == NGX_EINTR) ? NGX_LOG_INFO : NGX_LOG_ALERT,
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 5ef8e10c5..704492468 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -459,6 +459,12 @@ static char *ngx_event_init_conf(ngx_cycle_t *cycle, void *conf)
     ngx_conf_init_value(ecf->use, ngx_devpoll_module.ctx_index);
     ngx_conf_init_ptr_value(ecf->name, ngx_devpoll_module_ctx.name->data);
 
+#elif (HAVE_EPOLL)
+
+    ngx_conf_init_value(ecf->connections, DEFAULT_CONNECTIONS);
+    ngx_conf_init_value(ecf->use, ngx_epoll_module.ctx_index);
+    ngx_conf_init_ptr_value(ecf->name, ngx_epoll_module_ctx.name->data);
+
 #else /* HAVE_SELECT */
 
     ngx_conf_init_value(ecf->connections,
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 8ecd29bfb..cbd92a2fe 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -145,7 +145,7 @@ void ngx_event_accept(ngx_event_t *ev)
             }
 
         } else {
-            if ((ngx_event_flags & NGX_USE_AIO_EVENT) == 0) {
+            if (!(ngx_event_flags & NGX_USE_AIO_EVENT)) {
                 if (ngx_nonblocking(s) == -1) {
                     ngx_log_error(NGX_LOG_ALERT, log, ngx_socket_errno,
                                   ngx_nonblocking_n " failed");