summaryrefslogtreecommitdiffhomepage
path: root/src/event/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/event/modules')
-rw-r--r--src/event/modules/ngx_devpoll_module.c73
-rw-r--r--src/event/modules/ngx_kqueue_module.c89
-rw-r--r--src/event/modules/ngx_poll_module.c70
-rw-r--r--src/event/modules/ngx_select_module.c74
4 files changed, 48 insertions, 258 deletions
diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index ad44743a7..13971ad4d 100644
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -29,7 +29,7 @@ static int nevents;
static ngx_event_t **change_index;
-static ngx_event_t timer_queue;
+static ngx_event_t *timer_queue;
/* */
@@ -55,13 +55,15 @@ int ngx_devpoll_init(int max_connections, ngx_log_t *log)
ngx_alloc(sizeof(ngx_event_t *) * DEVPOLL_NCHANGES, log),
NGX_ERROR);
- timer_queue.timer_prev = &timer_queue;
- timer_queue.timer_next = &timer_queue;
+ timer_queue = ngx_event_init_timer(log);
+ if (timer_queue == NULL) {
+ return NGX_ERROR;
+ }
#if !(USE_DEVPOLL)
ngx_event_actions.add = ngx_devpoll_add_event;
ngx_event_actions.del = ngx_devpoll_del_event;
- ngx_event_actions.timer = ngx_devpoll_add_timer;
+ ngx_event_actions.timer = ngx_event_add_timer;
ngx_event_actions.process = ngx_devpoll_process_events;
#endif
@@ -116,6 +118,8 @@ int ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags)
return NGX_OK;
}
+ /* we need to restore second event if it exists */
+
if (event == NGX_READ_EVENT) {
e = c->write;
event = POLLOUT;
@@ -186,15 +190,16 @@ int ngx_devpoll_set_event(ngx_event_t *ev, int event, u_int flags)
int ngx_devpoll_process_events(ngx_log_t *log)
{
int events, n, i;
- u_int timer, delta;
+ ngx_msec_t timer, delta;
ngx_err_t err;
ngx_event_t *ev;
ngx_connection_t *c;
struct dvpoll dvp;
struct timeval tv;
- if (timer_queue.timer_next != &timer_queue) {
- timer = timer_queue.timer_next->timer_delta;
+ timer = ngx_event_find_timer();
+
+ if (timer) {
gettimeofday(&tv, NULL);
delta = tv.tv_sec * 1000 + tv.tv_usec / 1000;
@@ -300,59 +305,9 @@ int ngx_devpoll_process_events(ngx_log_t *log)
}
}
- if (timer != INFTIM && timer_queue.timer_next != &timer_queue) {
- if (delta >= timer_queue.timer_next->timer_delta) {
- for ( ;; ) {
- ev = timer_queue.timer_next;
-
- if (ev == &timer_queue || delta < ev->timer_delta) {
- break;
- }
-
- delta -= ev->timer_delta;
-
- ngx_del_timer(ev);
- ev->timedout = 1;
- if (ev->event_handler(ev) == NGX_ERROR) {
- ev->close_handler(ev);
- }
- }
-
- } else {
- timer_queue.timer_next->timer_delta -= delta;
- }
+ if (timer != INFTIM) {
+ ngx_event_expire_timers(delta);
}
return NGX_OK;
}
-
-
-void ngx_devpoll_add_timer(ngx_event_t *ev, ngx_msec_t timer)
-{
- ngx_event_t *e;
-
-#if (NGX_DEBUG_EVENT)
- ngx_connection_t *c = (ngx_connection_t *) ev->data;
- ngx_log_debug(ev->log, "set timer: %d:%d" _ c->fd _ timer);
-#endif
-
- if (ev->timer_next || ev->timer_prev) {
- ngx_log_error(NGX_LOG_ALERT, ev->log, 0, "timer already set");
- return;
- }
-
- for (e = timer_queue.timer_next;
- e != &timer_queue && timer > e->timer_delta;
- e = e->timer_next)
- {
- timer -= e->timer_delta;
- }
-
- ev->timer_delta = timer;
-
- ev->timer_next = e;
- ev->timer_prev = e->timer_prev;
-
- e->timer_prev->timer_next = ev;
- e->timer_prev = ev;
-}
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index 792798ef8..abf3b6e61 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -28,7 +28,7 @@ static struct kevent *change_list, *event_list;
static unsigned int nchanges;
static int nevents;
-static ngx_event_t timer_queue;
+static ngx_event_t *timer_queue;
/* */
@@ -51,20 +51,19 @@ int ngx_kqueue_init(int max_connections, ngx_log_t *log)
ngx_test_null(change_list, ngx_alloc(change_size, log), NGX_ERROR);
ngx_test_null(event_list, ngx_alloc(event_size, log), NGX_ERROR);
- if (ngx_event_init_timer(log) == NGX_ERROR) {
+ timer_queue = ngx_event_init_timer(log);
+ if (timer_queue == NULL) {
return NGX_ERROR;
}
-#if 0
- timer_queue.timer_prev = &timer_queue;
- timer_queue.timer_next = &timer_queue;
-#endif
-
#if !(USE_KQUEUE)
ngx_event_actions.add = ngx_kqueue_add_event;
ngx_event_actions.del = ngx_kqueue_del_event;
- ngx_event_actions.timer = ngx_kqueue_add_timer;
+ 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|NGX_HAVE_CLEAR_EVENT;
#endif
return NGX_OK;
@@ -170,7 +169,7 @@ int ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags)
int ngx_kqueue_process_events(ngx_log_t *log)
{
int events, i;
- u_int timer, delta;
+ ngx_msec_t timer, delta;
ngx_event_t *ev;
struct timeval tv;
struct timespec ts, *tp;
@@ -190,22 +189,6 @@ int ngx_kqueue_process_events(ngx_log_t *log)
tp = NULL;
}
-#if 0
- if (timer_queue.timer_next != &timer_queue) {
- timer = timer_queue.timer_next->timer_delta;
- ts.tv_sec = timer / 1000;
- ts.tv_nsec = (timer % 1000) * 1000000;
- tp = &ts;
- gettimeofday(&tv, NULL);
- delta = tv.tv_sec * 1000 + tv.tv_usec / 1000;
-
- } else {
- timer = 0;
- delta = 0;
- tp = NULL;
- }
-#endif
-
#if (NGX_DEBUG_EVENT)
ngx_log_debug(log, "kevent timer: %d" _ timer);
#endif
@@ -288,61 +271,5 @@ int ngx_kqueue_process_events(ngx_log_t *log)
ngx_event_expire_timers(delta);
}
-#if 0
- if (timer && timer_queue.timer_next != &timer_queue) {
- if (delta >= timer_queue.timer_next->timer_delta) {
- for ( ;; ) {
- ev = timer_queue.timer_next;
-
- if (ev == &timer_queue || delta < ev->timer_delta) {
- break;
- }
-
- delta -= ev->timer_delta;
-
- ngx_del_timer(ev);
- ev->timedout = 1;
- if (ev->event_handler(ev) == NGX_ERROR) {
- ev->close_handler(ev);
- }
- }
-
- } else {
- timer_queue.timer_next->timer_delta -= delta;
- }
- }
-#endif
-
return NGX_OK;
}
-
-
-void ngx_kqueue_add_timer(ngx_event_t *ev, ngx_msec_t timer)
-{
- ngx_event_t *e;
-
-#if (NGX_DEBUG_EVENT)
- ngx_connection_t *c = (ngx_connection_t *) ev->data;
- ngx_log_debug(ev->log, "set timer: %d:%d" _ c->fd _ timer);
-#endif
-
- if (ev->timer_next || ev->timer_prev) {
- ngx_log_error(NGX_LOG_ALERT, ev->log, 0, "timer already set");
- return;
- }
-
- for (e = timer_queue.timer_next;
- e != &timer_queue && timer > e->timer_delta;
- e = e->timer_next)
- {
- timer -= e->timer_delta;
- }
-
- ev->timer_delta = timer;
-
- ev->timer_next = e;
- ev->timer_prev = e->timer_prev;
-
- e->timer_prev->timer_next = ev;
- e->timer_prev = ev;
-}
diff --git a/src/event/modules/ngx_poll_module.c b/src/event/modules/ngx_poll_module.c
index 4b2434a5d..e27031cfc 100644
--- a/src/event/modules/ngx_poll_module.c
+++ b/src/event/modules/ngx_poll_module.c
@@ -17,7 +17,7 @@ static unsigned int nevents;
static ngx_event_t **event_index;
static ngx_event_t **ready_index;
-static ngx_event_t timer_queue;
+static ngx_event_t *timer_queue;
/* */
int ngx_poll_init(int max_connections, ngx_log_t *log)
@@ -36,12 +36,14 @@ int ngx_poll_init(int max_connections, ngx_log_t *log)
nevents = 0;
- timer_queue.timer_prev = &timer_queue;
- timer_queue.timer_next = &timer_queue;
+ timer_queue = ngx_event_init_timer(log);
+ if (timer_queue == NULL) {
+ return NGX_ERROR;
+ }
ngx_event_actions.add = ngx_poll_add_event;
ngx_event_actions.del = ngx_poll_del_event;
- ngx_event_actions.timer = ngx_poll_add_timer;
+ ngx_event_actions.timer = ngx_event_add_timer;
ngx_event_actions.process = ngx_poll_process_events;
return NGX_OK;
@@ -139,13 +141,14 @@ int ngx_poll_del_event(ngx_event_t *ev, int event, u_int flags)
int ngx_poll_process_events(ngx_log_t *log)
{
int i, ready, nready, found;
- u_int timer, delta;
+ ngx_msec_t timer, delta;
ngx_err_t err;
ngx_event_t *ev;
ngx_connection_t *c;
- if (timer_queue.timer_next != &timer_queue) {
- timer = timer_queue.timer_next->timer_delta;
+ timer = ngx_event_find_timer();
+
+ if (timer) {
delta = ngx_msec();
} else {
@@ -253,58 +256,9 @@ int ngx_poll_process_events(ngx_log_t *log)
ngx_log_error(NGX_LOG_ALERT, log, 0, "poll ready != events");
}
- if (timer != INFTIM && timer_queue.timer_next != &timer_queue) {
- if (delta >= timer_queue.timer_next->timer_delta) {
- for ( ;; ) {
- ev = timer_queue.timer_next;
-
- if (ev == &timer_queue || delta < ev->timer_delta) {
- break;
- }
-
- delta -= ev->timer_delta;
-
- ngx_del_timer(ev);
- ev->timedout = 1;
- if (ev->event_handler(ev) == NGX_ERROR) {
- ev->close_handler(ev);
- }
- }
-
- } else {
- timer_queue.timer_next->timer_delta -= delta;
- }
+ if (timer != INFTIM) {
+ ngx_event_expire_timers(delta);
}
return NGX_OK;
}
-
-void ngx_poll_add_timer(ngx_event_t *ev, ngx_msec_t timer)
-{
- ngx_event_t *e;
-
-#if (NGX_DEBUG_EVENT)
- ngx_connection_t *c = (ngx_connection_t *) ev->data;
- ngx_log_debug(ev->log, "set timer: %d:%d" _ c->fd _ timer);
-#endif
-
- if (ev->timer_next || ev->timer_prev) {
- ngx_log_error(NGX_LOG_ALERT, ev->log, 0, "timer already set");
- return;
- }
-
- for (e = timer_queue.timer_next;
- e != &timer_queue && timer > e->timer_delta;
- e = e->timer_next)
- {
- timer -= e->timer_delta;
- }
-
- ev->timer_delta = timer;
-
- ev->timer_next = e;
- ev->timer_prev = e->timer_prev;
-
- e->timer_prev->timer_next = ev;
- e->timer_prev = ev;
-}
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index 5b62dfd04..fe461c3f5 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -23,11 +23,11 @@ static int max_write;
static int max_fd;
#endif
-static u_int nevents;
+static int nevents;
static ngx_event_t **event_index;
static ngx_event_t **ready_index;
-static ngx_event_t timer_queue;
+static ngx_event_t *timer_queue;
/* */
int ngx_select_init(int max_connections, ngx_log_t *log)
@@ -57,12 +57,14 @@ int ngx_select_init(int max_connections, ngx_log_t *log)
nevents = 0;
- timer_queue.timer_prev = &timer_queue;
- timer_queue.timer_next = &timer_queue;
+ timer_queue = ngx_event_init_timer(log);
+ if (timer_queue == NULL) {
+ return NGX_ERROR;
+ }
ngx_event_actions.add = ngx_select_add_event;
ngx_event_actions.del = ngx_select_del_event;
- ngx_event_actions.timer = ngx_select_add_timer;
+ ngx_event_actions.timer = ngx_event_add_timer;
ngx_event_actions.process = ngx_select_process_events;
#if (WIN32)
@@ -176,7 +178,8 @@ int ngx_select_del_event(ngx_event_t *ev, int event, u_int flags)
int ngx_select_process_events(ngx_log_t *log)
{
int ready, found, nready;
- u_int i, timer, delta;
+ u_int i;
+ ngx_msec_t timer, delta;
ngx_event_t *ev;
ngx_connection_t *c;
struct timeval tv, *tp;
@@ -184,12 +187,12 @@ int ngx_select_process_events(ngx_log_t *log)
work_read_fd_set = master_read_fd_set;
work_write_fd_set = master_write_fd_set;
- if (timer_queue.timer_next != &timer_queue) {
- timer = timer_queue.timer_next->timer_delta;
+ timer = ngx_event_find_timer();
+
+ if (timer) {
tv.tv_sec = timer / 1000;
tv.tv_usec = (timer % 1000) * 1000;
tp = &tv;
-
delta = ngx_msec();
} else {
@@ -309,58 +312,9 @@ int ngx_select_process_events(ngx_log_t *log)
ngx_log_error(NGX_LOG_ALERT, log, 0, "select ready != events");
}
- if (timer && timer_queue.timer_next != &timer_queue) {
- if (delta >= timer_queue.timer_next->timer_delta) {
- for ( ;; ) {
- ev = timer_queue.timer_next;
-
- if (ev == &timer_queue || delta < ev->timer_delta) {
- break;
- }
-
- delta -= ev->timer_delta;
-
- ngx_del_timer(ev);
- ev->timedout = 1;
- if (ev->event_handler(ev) == NGX_ERROR) {
- ev->close_handler(ev);
- }
- }
-
- } else {
- timer_queue.timer_next->timer_delta -= delta;
- }
+ if (timer) {
+ ngx_event_expire_timers(delta);
}
return NGX_OK;
}
-
-void ngx_select_add_timer(ngx_event_t *ev, ngx_msec_t timer)
-{
- ngx_event_t *e;
-
-#if (NGX_DEBUG_EVENT)
- ngx_connection_t *c = (ngx_connection_t *) ev->data;
- ngx_log_debug(ev->log, "set timer: %d:%d" _ c->fd _ timer);
-#endif
-
- if (ev->timer_next || ev->timer_prev) {
- ngx_log_error(NGX_LOG_ALERT, ev->log, 0, "timer already set");
- return;
- }
-
- for (e = timer_queue.timer_next;
- e != &timer_queue && timer > e->timer_delta;
- e = e->timer_next)
- {
- timer -= e->timer_delta;
- }
-
- ev->timer_delta = timer;
-
- ev->timer_next = e;
- ev->timer_prev = e->timer_prev;
-
- e->timer_prev->timer_next = ev;
- e->timer_prev = ev;
-}
generated by cgit (git 2.34.1) at 2025-12-31 18:22:05 +0000