3 files changed, 131 insertions, 4 deletions

diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index da8450e62..501b4960e 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -66,13 +66,21 @@ int ngx_kqueue_init(int max_connections, ngx_log_t *log)
     ngx_event_actions.timer = ngx_event_add_timer;
     ngx_event_actions.process = ngx_kqueue_process_events;
 
-    ngx_event_flags = NGX_HAVE_LEVEL_EVENT
-                     |NGX_HAVE_ONESHOT_EVENT
 #if (HAVE_AIO_EVENT)
-                     |NGX_HAVE_AIO_EVENT;
+
+    ngx_event_flags = NGX_HAVE_AIO_EVENT;
+
 #else
-                     |NGX_HAVE_CLEAR_EVENT;
+
+    ngx_event_flags = NGX_HAVE_LEVEL_EVENT
+                     |NGX_HAVE_ONESHOT_EVENT
+#if (HAVE_CLEAR_EVENT)
+                     |NGX_HAVE_CLEAR_EVENT
 #endif
+                     |NGX_HAVE_KQUEUE_EVENT;
+
+#endif
+
 #endif
 
     return NGX_OK;
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index 939340e46..25319c806 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -214,6 +214,8 @@ int ngx_poll_process_events(ngx_log_t *log)
         if (event_list[i].revents & (POLLERR|POLLHUP|POLLNVAL)) {
             found = 1;
 
+            /* need ot add to ready_index[nready++] = c->read or c->write; */
+
             err = 0;
             if (event_list[i].revents & POLLNVAL) {
                 err = EBADF;
diff --git a/src/event/modules/ngx_sigio_module.c b/src/event/modules/ngx_sigio_module.c
new file mode 100644
index 000000000..f597b393d
--- /dev/null
+++ b/src/event/modules/ngx_sigio_module.c
@@ -0,0 +1,117 @@
+
+
+int ngx_sigio_add_event(ngx_event_t *ev, int signal)
+{
+    ngx_connection_t  *c;
+
+    c = (ngx_connection_t *) ev->data;
+
+    if (fcntl(c->fd, F_SETFL, O_RDWR|O_NONBLOCK|O_ASYNC) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
+                      "fcntl(O_RDWR|O_NONBLOCK|O_ASYNC) failed");
+        return NGX_ERROR;
+    }
+
+    if (fcntl(c->fd, F_SETSIG, signal) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
+                      "fcntl(F_SETSIG) failed");
+        return NGX_ERROR;
+    }
+
+    if (fcntl(c->fd, F_SETOWN, pid) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
+                      "fcntl(F_SETOWN) failed");
+        return NGX_ERROR;
+    }
+
+#if (HAVE_ONESIGFD)
+    if (fcntl(c->fd, F_SETAUXFL, O_ONESIGFD) == -1) {
+        ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
+                      "fcntl(F_SETAUXFL) failed");
+        return NGX_ERROR;
+    }
+#endif
+
+    return NGX_OK;
+}
+
+int ngx_sigio_process_events(ngx_log_t *log)
+{
+    struct siginfo  si;
+
+    for ( ;; ) {
+        if (timer) {
+            sig = sigtimedwait(&sigio_set, &si, &ts);
+
+            if (sig == -1) {
+                ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
+                              "sigtimedwait() failed");
+                continue;
+            }
+        }
+
+        } else {
+            sig = sigwaitinfo(&set, &si);
+
+            if (sig == -1) {
+                ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
+                              "sigwaitinfo() failed");
+            }
+        }
+
+        if (sig == rtsig) {
+            c = &ngx_connections[si.si_fd];
+
+            if (si.si_band & (POLLERR|POLLHUP|POLLNVAL)) {
+                ev = ???;
+
+                if (ev->active) {
+                    ev->ready = 1;
+                    if (ev->event_handler(ev) == NGX_ERROR) {
+                        ev->close_handler(ev);
+                    }
+                }
+            }
+
+            if (si.si_band & (POLLIN)) {
+                ev = c->read;
+
+                if (ev->active) {
+                    ev->ready = 1;
+                    if (ev->event_handler(ev) == NGX_ERROR) {
+                        ev->close_handler(ev);
+                    }
+                }
+            }
+
+            if (si.si_band & (POLLOUT)) {
+                ev = c->write;
+
+                if (ev->active) {
+                    ev->ready = 1;
+                    if (ev->event_handler(ev) == NGX_ERROR) {
+                        ev->close_handler(ev);
+                    }
+                }
+            }
+
+        } else if (sig == SIGIO) {
+            ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
+                          "Signal queue overflowed: "
+                          "SIGIO, fd:%d, band:%d", si.si_fd, si.si_band);
+
+            /* flush queue: method #1 (dphttpd) */
+            ts.tv_sec = 0;
+            ts.tv_nsec = 0;
+            while (sigtimedwait(&sigio_set, &si, &ts) > 0);
+
+            /* flush queue: method #2 (dkftpbench) */
+            signal(m_signum, SIG_IGN);
+            signal(m_signum, SIG_DFL);
+
+            /* do poll */
+
+        } else {
+        }
+    }
+}