diff options
Diffstat (limited to '')
| -rw-r--r-- | src/event/modules/ngx_kqueue_module.c | 53 | ||||
| -rw-r--r-- | src/event/ngx_event_posted.c | 9 | ||||
| -rw-r--r-- | src/event/ngx_event_posted.h | 4 | ||||
| -rw-r--r-- | src/event/ngx_event_timer.c | 4 |
4 files changed, 47 insertions, 23 deletions
diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c index 99370ac42..cc84d2eaa 100644 --- a/src/event/modules/ngx_kqueue_module.c +++ b/src/event/modules/ngx_kqueue_module.c @@ -193,7 +193,8 @@ static ngx_int_t ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags) ev->disabled = 0; ev->oneshot = (flags & NGX_ONESHOT_EVENT) ? 1 : 0; - if (nchanges > 0 + if (ngx_thread_main() + && nchanges > 0 && ev->index < (u_int) nchanges && ((uintptr_t) change_list[ev->index].udata & (uintptr_t) ~1) == (uintptr_t) ev) @@ -237,7 +238,8 @@ static ngx_int_t ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags) ev->disabled = 0; ev->posted = 0; - if (nchanges > 0 + if (ngx_thread_main() + && nchanges > 0 && ev->index < (u_int) nchanges && ((uintptr_t) change_list[ev->index].udata & (uintptr_t) ~1) == (uintptr_t) ev) @@ -280,6 +282,7 @@ static ngx_int_t ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags) { struct timespec ts; ngx_connection_t *c; + struct kevent *kev, kv; c = ev->data; @@ -287,7 +290,7 @@ static ngx_int_t ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags) "kevent set event: %d: ft:%d fl:%04X", c->fd, filter, flags); - if (nchanges >= max_changes) { + if (ngx_thread_main() && nchanges >= max_changes) { ngx_log_error(NGX_LOG_WARN, ev->log, 0, "kqueue change list is filled up"); @@ -302,40 +305,52 @@ static ngx_int_t ngx_kqueue_set_event(ngx_event_t *ev, int filter, u_int flags) nchanges = 0; } - change_list[nchanges].ident = c->fd; - change_list[nchanges].filter = filter; - change_list[nchanges].flags = flags; - change_list[nchanges].udata = (void *) ((uintptr_t) ev | ev->instance); + kev = ngx_thread_main() ? &change_list[nchanges] : &kv; + + kev->ident = c->fd; + kev->filter = filter; + kev->flags = flags; + kev->udata = (void *) ((uintptr_t) ev | ev->instance); if (filter == EVFILT_VNODE) { - change_list[nchanges].fflags = NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND - |NOTE_ATTRIB|NOTE_RENAME + kev->fflags = NOTE_DELETE|NOTE_WRITE|NOTE_EXTEND + |NOTE_ATTRIB|NOTE_RENAME #if (__FreeBSD__ == 4 && __FreeBSD_version >= 430000) \ || __FreeBSD_version >= 500018 - |NOTE_REVOKE + |NOTE_REVOKE #endif ; - change_list[nchanges].data = 0; + kev->data = 0; } else { #if (HAVE_LOWAT_EVENT) if (flags & NGX_LOWAT_EVENT) { - change_list[nchanges].fflags = NOTE_LOWAT; - change_list[nchanges].data = ev->available; + kev->fflags = NOTE_LOWAT; + kev->data = ev->available; } else { - change_list[nchanges].fflags = 0; - change_list[nchanges].data = 0; + kev->fflags = 0; + kev->data = 0; } #else - change_list[nchanges].fflags = 0; - change_list[nchanges].data = 0; + kev->fflags = 0; + kev->data = 0; #endif } - ev->index = nchanges; + if (ngx_thread_main()) { + ev->index = nchanges; + nchanges++; + + } else { + ts.tv_sec = 0; + ts.tv_nsec = 0; - nchanges++; + if (kevent(ngx_kqueue, &kv, 1, NULL, 0, &ts) == -1) { + ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno, "kevent() failed"); + return NGX_ERROR; + } + } return NGX_OK; } diff --git a/src/event/ngx_event_posted.c b/src/event/ngx_event_posted.c index b103159b0..795aa6171 100644 --- a/src/event/ngx_event_posted.c +++ b/src/event/ngx_event_posted.c @@ -92,13 +92,16 @@ ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle) || (ev->use_instance && ev->instance != ev->returned_instance)) { /* - * the stale event from a file descriptor - * that was just closed in this iteration + * The stale event from a file descriptor that was just + * closed in this iteration. We use ngx_cycle->log + * because ev->log may be already destoyed. */ - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ev->log, 0, + ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0, "kevent: stale event " PTR_FMT, ev); + ngx_unlock(ev->lock); + ev = ev->next; continue; diff --git a/src/event/ngx_event_posted.h b/src/event/ngx_event_posted.h index ba484fac0..c2945c4ff 100644 --- a/src/event/ngx_event_posted.h +++ b/src/event/ngx_event_posted.h @@ -8,9 +8,11 @@ #define ngx_post_event(ev) \ + if (!ev->posted) { \ ev->next = (ngx_event_t *) ngx_posted_events; \ ngx_posted_events = ev; \ - ev->posted = 1; + ev->posted = 1; \ + } void ngx_event_process_posted(ngx_cycle_t *cycle); diff --git a/src/event/ngx_event_timer.c b/src/event/ngx_event_timer.c index 0f6de6793..893b2a9e1 100644 --- a/src/event/ngx_event_timer.c +++ b/src/event/ngx_event_timer.c @@ -87,9 +87,11 @@ void ngx_event_expire_timers(ngx_msec_t timer) ev = (ngx_event_t *) ((char *) node - offsetof(ngx_event_t, rbtree_key)); +#if (NGX_THREADS) if (ngx_trylock(ev->lock) == 0) { break; } +#endif ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ev->log, 0, "event timer del: %d: %d", @@ -109,7 +111,9 @@ void ngx_event_expire_timers(ngx_msec_t timer) ev->timer_set = 0; ev->timedout = 1; +#if (NGX_THREADS) ngx_unlock(ev->lock); +#endif if (ngx_threaded) { if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) { |