nginx-0.0.1-2002-12-15-09:25:09 import
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index 3b65f80..4e82162 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -16,12 +16,14 @@
#endif
-
+/* should be per-thread */
static int kq;
static struct kevent *change_list, *event_list;
static int nchanges, nevents;
static ngx_event_t timer_queue;
+/* */
+
int ngx_kqueue_init(int max_connections, ngx_log_t *log)
{
@@ -53,6 +55,7 @@
return NGX_OK;
}
+
int ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags)
{
ev->oneshot = (flags & NGX_ONESHOT_EVENT) ? 1: 0;
@@ -60,22 +63,33 @@
return ngx_kqueue_set_event(ev, event, EV_ADD | flags);
}
-int ngx_kqueue_del_event(ngx_event_t *ev, int event)
+
+int ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags)
{
ngx_event_t *e;
- if (ev->index <= nchanges && change_list[ev->index].udata == ev) {
- change_list[ev->index] = change_list[nchanges];
- e = (ngx_event_t *) change_list[ev->index].udata;
- e->index = ev->index;
- nchanges--;
+ if (ev->index < nchanges && change_list[ev->index].udata == ev) {
+
+ ngx_connection_t *cn = (ngx_connection_t *) ev->data;
+ ngx_log_debug(ev->log, "kqueue del event: %d: ft:%d" _
+ cn->fd _ event);
+
+ if (ev->index < --nchanges) {
+ e = (ngx_event_t *) change_list[nchanges].udata;
+ change_list[ev->index] = change_list[nchanges];
+ e->index = ev->index;
+ }
return NGX_OK;
}
+ if (flags & NGX_CLOSE_EVENT)
+ return NGX_OK;
+
return ngx_kqueue_set_event(ev, event, EV_DELETE);
}
+
int ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags)
{
struct timespec ts = { 0, 0 };
@@ -110,13 +124,18 @@
return NGX_OK;
}
+
int ngx_kqueue_process_events(ngx_log_t *log)
{
int events, i;
- u_int timer = 0, delta = 0;
+ u_int timer, delta;
ngx_event_t *ev;
struct timeval tv;
- struct timespec ts, *tp = NULL;
+ struct timespec ts, *tp;
+
+ timer = 0;
+ delta = 0;
+ tp = NULL;
if (timer_queue.timer_next != &timer_queue) {
timer = timer_queue.timer_next->timer_delta;
@@ -212,6 +231,7 @@
return NGX_OK;
}
+
void ngx_kqueue_add_timer(ngx_event_t *ev, ngx_msec_t timer)
{
ngx_event_t *e;
diff --git a/src/event/modules/ngx_kqueue_module.h b/src/event/modules/ngx_kqueue_module.h
index ce2aacd..c561920 100644
--- a/src/event/modules/ngx_kqueue_module.h
+++ b/src/event/modules/ngx_kqueue_module.h
@@ -8,7 +8,7 @@
int ngx_kqueue_init(int max_connections, ngx_log_t *log);
int ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags);
-int ngx_kqueue_del_event(ngx_event_t *ev, int event);
+int ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags);
int ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags);
void ngx_kqueue_add_timer(ngx_event_t *ev, ngx_msec_t timer);
int ngx_kqueue_process_events(ngx_log_t *log);
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index 54a5f7e..c87c592 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -8,24 +8,26 @@
#include <ngx_event.h>
#include <ngx_select_module.h>
-static fd_set master_read_fd_set;
-static fd_set master_write_fd_set;
-static fd_set work_read_fd_set;
-static fd_set work_write_fd_set;
+
+/* should be per-thread */
+static fd_set master_read_fd_set;
+static fd_set master_write_fd_set;
+static fd_set work_read_fd_set;
+static fd_set work_write_fd_set;
#if (WIN32)
-static int max_read;
-static int max_write;
+static int max_read;
+static int max_write;
#else
-static int max_fd;
+static int max_fd;
#endif
-static int nevents;
+static int nevents;
static ngx_event_t **event_index;
static ngx_event_t **ready_index;
static ngx_event_t timer_queue;
-
+/* */
static fd_set *ngx_select_get_fd_set(ngx_socket_t fd, int event,
ngx_log_t *log);
@@ -121,12 +123,15 @@
return NGX_OK;
}
-int ngx_select_del_event(ngx_event_t *ev, int event)
+int ngx_select_del_event(ngx_event_t *ev, int event, u_int flags)
{
ngx_connection_t *c;
c = (ngx_connection_t *) ev->data;
- ngx_log_debug(c->log, "del event: %d" _ c->fd);
+ if (ev->index == NGX_INVALID_INDEX)
+ return NGX_OK;
+
+ ngx_log_debug(c->log, "del event: %d, %d" _ c->fd _ event);
#if (WIN32)
if (event == NGX_READ_EVENT) {
@@ -148,13 +153,13 @@
max_fd = -1;
#endif
- nevents--;
-
- if (ev->index < nevents) {
+ if (ev->index < --nevents) {
event_index[ev->index] = event_index[nevents];
event_index[ev->index]->index = ev->index;
}
+ ev->index = NGX_INVALID_INDEX;
+
return NGX_OK;
}
@@ -162,7 +167,7 @@
{
int i, ready, found, nready;
u_int timer, delta;
- ngx_event_t *ev, *nx;
+ ngx_event_t *ev;
ngx_connection_t *c;
struct timeval tv, *tp;
@@ -195,6 +200,15 @@
}
#endif
+#if 1
+ /* DEBUG */
+ for (i = 0; i < nevents; i++) {
+ ev = event_index[i];
+ c = (ngx_connection_t *) ev->data;
+ ngx_log_debug(log, "select: %d" _ c->fd);
+ }
+#endif
+
ngx_log_debug(log, "select timer: %d" _ timer);
#if (WIN32)
@@ -222,17 +236,17 @@
if (timer) {
if (delta >= timer) {
- for (ev = timer_queue.timer_next;
- ev != &timer_queue && delta >= ev->timer_delta;
- /* void */)
- {
+ for ( ;; ) {
+ ev = timer_queue.timer_next;
+
+ if (ev == &timer_queue || delta < ev->timer_delta)
+ break;
+
delta -= ev->timer_delta;
- nx = ev->timer_next;
ngx_del_timer(ev);
ev->timedout = 1;
- if (ev->event_handler(ev) == -1)
+ if (ev->event_handler(ev) == NGX_ERROR)
ev->close_handler(ev);
- ev = nx;
}
} else {
@@ -249,15 +263,13 @@
if (ev->write) {
if (FD_ISSET(c->fd, &work_write_fd_set)) {
- ngx_log_debug(log, "select write %d" _
- c->fd);
+ ngx_log_debug(log, "select write %d" _ c->fd);
found = 1;
}
} else {
if (FD_ISSET(c->fd, &work_read_fd_set)) {
- ngx_log_debug(log, "select read %d" _
- c->fd);
+ ngx_log_debug(log, "select read %d" _ c->fd);
found = 1;
}
}
@@ -274,13 +286,14 @@
if (ev->oneshot) {
ngx_del_timer(ev);
+
if (ev->write)
- ngx_select_del_event(ev, NGX_WRITE_EVENT);
+ ngx_select_del_event(ev, NGX_WRITE_EVENT, 0);
else
- ngx_select_del_event(ev, NGX_READ_EVENT);
+ ngx_select_del_event(ev, NGX_READ_EVENT, 0);
}
- if (ev->event_handler(ev) == -1)
+ if (ev->event_handler(ev) == NGX_ERROR)
ev->close_handler(ev);
ready--;
diff --git a/src/event/modules/ngx_select_module.h b/src/event/modules/ngx_select_module.h
index e2583d7..7460790 100644
--- a/src/event/modules/ngx_select_module.h
+++ b/src/event/modules/ngx_select_module.h
@@ -8,7 +8,7 @@
int ngx_select_init(int max_connections, ngx_log_t *log);
int ngx_select_add_event(ngx_event_t *ev, int event, u_int flags);
-int ngx_select_del_event(ngx_event_t *ev, int event);
+int ngx_select_del_event(ngx_event_t *ev, int event, u_int flags);
int ngx_select_set_event(ngx_event_t *ev, int filter, u_int flags);
void ngx_select_add_timer(ngx_event_t *ev, ngx_msec_t timer);
int ngx_select_process_events(ngx_log_t *log);
