diff options
Diffstat (limited to '')
| -rw-r--r-- | src/event/modules/ngx_kqueue_module.c | 19 | ||||
| -rw-r--r-- | src/event/ngx_event.c | 2 |
2 files changed, 16 insertions, 5 deletions
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c index aad8581a9..3b65f8063 100644 --- a/src/event/modules/ngx_kqueue_module.c +++ b/src/event/modules/ngx_kqueue_module.c @@ -2,10 +2,6 @@ * Copyright (C) 2002 Igor Sysoev, http://sysoev.ru */ -/* - NEED ? : unify change_list and event_list: - event_list = change_list; -*/ #include <ngx_config.h> #include <ngx_core.h> @@ -66,6 +62,17 @@ 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) { + 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--; + + return NGX_OK; + } + return ngx_kqueue_set_event(ev, event, EV_DELETE); } @@ -94,6 +101,10 @@ int ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags) change_list[nchanges].fflags = 0; change_list[nchanges].data = 0; change_list[nchanges].udata = ev; + + if (flags == EV_ADD) + ev->index = nchanges; + nchanges++; return NGX_OK; diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c index 8fbdbe5d2..68b6bf812 100644 --- a/src/event/ngx_event.c +++ b/src/event/ngx_event.c @@ -21,7 +21,7 @@ ngx_event_t *ngx_read_events, *ngx_write_events; #if !(USE_KQUEUE) -#if 1 +#if 0 ngx_event_type_e ngx_event_type = NGX_SELECT_EVENT; #else ngx_event_type_e ngx_event_type = NGX_KQUEUE_EVENT; |