nginx-0.0.3-2004-06-01-10:04:46 import
diff --git a/src/event/modules/ngx_rtsig_module.c b/src/event/modules/ngx_rtsig_module.c
index af5d772..1206245 100644
--- a/src/event/modules/ngx_rtsig_module.c
+++ b/src/event/modules/ngx_rtsig_module.c
@@ -16,10 +16,6 @@
#define si_fd __spare__[0]
int sigtimedwait(const sigset_t *set, siginfo_t *info,
- const struct timespec *timeout);
-
-
-int sigtimedwait(const sigset_t *set, siginfo_t *info,
const struct timespec *timeout)
{
return -1;
@@ -105,6 +101,7 @@
sigemptyset(&set);
sigaddset(&set, rtscf->signo);
+ sigaddset(&set, rtscf->signo + 1);
sigaddset(&set, SIGIO);
if (sigprocmask(SIG_BLOCK, &set, NULL) == -1) {
@@ -133,12 +130,15 @@
static int ngx_rtsig_add_connection(ngx_connection_t *c)
{
+ int signo;
ngx_rtsig_conf_t *rtscf;
rtscf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_rtsig_module);
+ signo = rtscf->signo + c->read->instance;
+
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
- "rtsig add connection: fd:%d signo:%d", c->fd, rtscf->signo);
+ "rtsig add connection: fd:%d signo:%d", c->fd, signo);
if (fcntl(c->fd, F_SETFL, O_RDWR|O_NONBLOCK|O_ASYNC) == -1) {
ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
@@ -146,13 +146,13 @@
return NGX_ERROR;
}
- if (fcntl(c->fd, F_SETSIG, rtscf->signo) == -1) {
+ if (fcntl(c->fd, F_SETSIG, signo) == -1) {
ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
"fcntl(F_SETSIG) failed");
return NGX_ERROR;
}
- if (fcntl(c->fd, F_SETOWN, ngx_getpid()) == -1) {
+ if (fcntl(c->fd, F_SETOWN, ngx_pid) == -1) {
ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
"fcntl(F_SETOWN) failed");
return NGX_ERROR;
@@ -175,6 +175,9 @@
static int ngx_rtsig_del_connection(ngx_connection_t *c, u_int flags)
{
+ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
+ "rtsig del connection: fd:%d", c->fd);
+
if (!(flags & NGX_CLOSE_EVENT)) {
if (fcntl(c->fd, F_SETFL, O_RDWR|O_NONBLOCK) == -1) {
ngx_log_error(NGX_LOG_ALERT, c->log, ngx_errno,
@@ -273,9 +276,9 @@
ngx_elapsed_msec = tv.tv_sec * 1000 + tv.tv_usec / 1000 - ngx_start_msec;
if (err) {
+ ngx_accept_mutex_unlock();
ngx_log_error((err == NGX_EINTR) ? NGX_LOG_INFO : NGX_LOG_ALERT,
cycle->log, err, "sigtimedwait() failed");
- ngx_accept_mutex_unlock();
return NGX_ERROR;
}
@@ -287,17 +290,40 @@
}
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
- "signo:%d fd:%d band:%X", signo, si.si_fd, si.si_band);
+ "rtsig signo:%d fd:%d band:%X", signo, si.si_fd, si.si_band);
rtscf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_rtsig_module);
- if (signo == rtscf->signo) {
+ if (signo == rtscf->signo || signo == rtscf->signo + 1) {
/* TODO: old_cycles */
c = &ngx_cycle->connections[si.si_fd];
- /* TODO: stale signals */
+ instance = signo - rtscf->signo;
+
+ if (si.si_band & POLLIN) {
+ c->read->returned_instance = instance;
+ }
+
+ if (si.si_band & POLLOUT) {
+ c->write->returned_instance = instance;
+ }
+
+ if (c->read->instance != instance) {
+
+ /*
+ * the stale event from a file descriptor
+ * that was just closed in this iteration
+ */
+
+ ngx_accept_mutex_unlock();
+
+ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+ "rtsig: stale event " PTR_FMT, c);
+
+ return NGX_OK;
+ }
if (si.si_band & (POLLIN|POLLHUP|POLLERR)) {
if (c->read->active) {
@@ -307,7 +333,7 @@
c->read->event_handler(c->read);
} else if (c->read->accept) {
- if (ngx_accept_disabled > 0) {
+ if (ngx_accept_disabled <= 0) {
c->read->event_handler(c->read);
}
@@ -371,9 +397,11 @@
} else {
+ ngx_accept_mutex_unlock();
+
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
"sigtimedwait() returned unexpected signal: %d", signo);
- ngx_accept_mutex_unlock();
+
return NGX_ERROR;
}
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 87747c3..c2c7c89 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -372,9 +372,16 @@
rev->event_handler = &ngx_event_accept;
if (ngx_event_flags & NGX_USE_SIGIO_EVENT) {
- if (ngx_add_conn(c) == NGX_ERROR) {
- return NGX_ERROR;
+
+ if (ngx_accept_mutex) {
+ ngx_accept_mutex_held = 0;
+
+ } else {
+ if (ngx_add_conn(c) == NGX_ERROR) {
+ return NGX_ERROR;
+ }
}
+
} else {
if (ngx_add_event(rev, NGX_READ_EVENT, 0) == NGX_ERROR) {
return NGX_ERROR;
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index 0fa0f70..db56f10 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -264,6 +264,16 @@
}
}
+ if (ngx_add_conn) {
+ if (rc == -1) {
+ /* NGX_EINPROGRESS */
+ return NGX_AGAIN;
+ }
+
+ ngx_log_debug0(NGX_LOG_DEBUG_EVENT, pc->log, 0, "connected");
+ return NGX_OK;
+ }
+
if (ngx_event_flags & NGX_USE_AIO_EVENT) {
/* aio, iocp */
@@ -294,8 +304,6 @@
return NGX_OK;
}
- /* TODO: epoll */
-
if (ngx_event_flags & NGX_USE_CLEAR_EVENT) { /* kqueue */
event = NGX_CLEAR_EVENT;
diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c
index 3480986..dac38be 100644
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -225,7 +225,7 @@
/* if there're no bufs to read in then disable a level event */
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, p->log, 0,
- "no pipe hunks to read in");
+ "no pipe bufs to read in");
break;
}
