diff options
Diffstat (limited to 'src/event/modules/ngx_epoll_module.c')
| -rw-r--r-- | src/event/modules/ngx_epoll_module.c | 189 |
1 files changed, 55 insertions, 134 deletions
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index a53b8eb26..14013dcd7 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -70,13 +70,14 @@ typedef struct { } ngx_epoll_conf_t; -static ngx_int_t ngx_epoll_init(ngx_cycle_t *cycle); +static ngx_int_t ngx_epoll_init(ngx_cycle_t *cycle, ngx_msec_t timer); static void ngx_epoll_done(ngx_cycle_t *cycle); static ngx_int_t ngx_epoll_add_event(ngx_event_t *ev, int event, u_int flags); static ngx_int_t ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags); static ngx_int_t ngx_epoll_add_connection(ngx_connection_t *c); static ngx_int_t ngx_epoll_del_connection(ngx_connection_t *c, u_int flags); -static ngx_int_t ngx_epoll_process_events(ngx_cycle_t *cycle); +static ngx_int_t ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, + ngx_uint_t flags); static void *ngx_epoll_create_conf(ngx_cycle_t *cycle); static char *ngx_epoll_init_conf(ngx_cycle_t *cycle, void *conf); @@ -137,7 +138,7 @@ ngx_module_t ngx_epoll_module = { static ngx_int_t -ngx_epoll_init(ngx_cycle_t *cycle) +ngx_epoll_init(ngx_cycle_t *cycle, ngx_msec_t timer) { ngx_event_conf_t *ecf; ngx_epoll_conf_t *epcf; @@ -382,57 +383,20 @@ ngx_epoll_del_connection(ngx_connection_t *c, u_int flags) static ngx_int_t -ngx_epoll_process_events(ngx_cycle_t *cycle) +ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) { int events; uint32_t revents; ngx_int_t instance, i; - ngx_uint_t lock, accept_lock; + ngx_uint_t level; ngx_err_t err; ngx_log_t *log; - ngx_msec_t timer, delta; - ngx_event_t *rev, *wev; - struct timeval tv; + ngx_msec_t delta; + ngx_event_t *rev, *wev, **queue; ngx_connection_t *c; - timer = ngx_event_find_timer(); - -#if (NGX_THREADS) - - if (timer == NGX_TIMER_ERROR) { - return NGX_ERROR; - } - - if (timer == NGX_TIMER_INFINITE || timer > 500) { - timer = 500; - } - -#endif - /* NGX_TIMER_INFINITE == INFTIM */ - accept_lock = 0; - - if (ngx_accept_mutex) { - if (ngx_accept_disabled > 0) { - ngx_accept_disabled--; - - } else { - if (ngx_trylock_accept_mutex(cycle) == NGX_ERROR) { - return NGX_ERROR; - } - - if (ngx_accept_mutex_held) { - accept_lock = 1; - - } else if (timer == NGX_TIMER_INFINITE - || timer > ngx_accept_mutex_delay) - { - timer = ngx_accept_mutex_delay; - } - } - } - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "epoll timer: %M", timer); @@ -444,14 +408,14 @@ ngx_epoll_process_events(ngx_cycle_t *cycle) err = 0; } - ngx_gettimeofday(&tv); - ngx_time_update(tv.tv_sec); - - delta = ngx_current_time; - ngx_current_time = (ngx_msec_t) tv.tv_sec * 1000 + tv.tv_usec / 1000; + delta = ngx_current_msec; + + if (flags & NGX_UPDATE_TIME) { + ngx_time_update(0, 0); + } if (timer != NGX_TIMER_INFINITE) { - delta = ngx_current_time - delta; + delta = ngx_current_msec - delta; ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "epoll timer: %M, delta: %M", timer, delta); @@ -459,30 +423,34 @@ ngx_epoll_process_events(ngx_cycle_t *cycle) if (events == 0) { ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "epoll_wait() returned no events without timeout"); - ngx_accept_mutex_unlock(); return NGX_ERROR; } } if (err) { - ngx_log_error((err == NGX_EINTR) ? NGX_LOG_INFO : NGX_LOG_ALERT, - cycle->log, err, "epoll_wait() failed"); - ngx_accept_mutex_unlock(); - return NGX_ERROR; - } + if (err == NGX_EINTR) { - if (events > 0) { - if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) { - ngx_accept_mutex_unlock(); - return NGX_ERROR; - } + if (ngx_event_timer_alarm) { + ngx_event_timer_alarm = 0; + return NGX_OK; + } + + level = NGX_LOG_INFO; + + } else { + level = NGX_LOG_ALERT; + } - lock = 1; + ngx_log_error(level, cycle->log, err, "epoll_wait() failed"); + return NGX_ERROR; + } - } else { - lock =0; + if (events == 0) { + return NGX_OK; } + ngx_mutex_lock(ngx_posted_events_mutex); + log = cycle->log; for (i = 0; i < events; i++) { @@ -539,95 +507,48 @@ ngx_epoll_process_events(ngx_cycle_t *cycle) revents |= EPOLLIN|EPOLLOUT; } - wev = c->write; - - if ((revents & EPOLLOUT) && wev->active) { - - if (ngx_threaded) { - wev->posted_ready = 1; - ngx_post_event(wev); - - } else { - wev->ready = 1; - - if (!ngx_accept_mutex_held) { - wev->handler(wev); - - } else { - ngx_post_event(wev); - } - } - } - - /* - * EPOLLIN must be handled after EPOLLOUT because we use - * the optimization to avoid the unnecessary mutex locking/unlocking - * if the accept event is the last one. - */ - if ((revents & EPOLLIN) && rev->active) { - if (ngx_threaded && !rev->accept) { + if ((flags & NGX_POST_THREAD_EVENTS) && !rev->accept) { rev->posted_ready = 1; - ngx_post_event(rev); - - continue; + } else { + rev->ready = 1; } - rev->ready = 1; - - if (!ngx_threaded && !ngx_accept_mutex_held) { - rev->handler(rev); - - } else if (!rev->accept) { - ngx_post_event(rev); + if (flags & NGX_POST_EVENTS) { + queue = (ngx_event_t **) (rev->accept ? + &ngx_posted_accept_events : &ngx_posted_events); - } else if (ngx_accept_disabled <= 0) { - - ngx_mutex_unlock(ngx_posted_events_mutex); + ngx_locked_post_event(rev, queue); + } else { rev->handler(rev); - - if (ngx_accept_disabled > 0) { - ngx_accept_mutex_unlock(); - accept_lock = 0; - } - - if (i + 1 == events) { - lock = 0; - break; - } - - if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) { - if (accept_lock) { - ngx_accept_mutex_unlock(); - } - return NGX_ERROR; - } } } - } - if (accept_lock) { - ngx_accept_mutex_unlock(); - } + wev = c->write; - if (lock) { - ngx_mutex_unlock(ngx_posted_events_mutex); - } + if ((revents & EPOLLOUT) && wev->active) { - ngx_event_expire_timers(); + if (flags & NGX_POST_THREAD_EVENTS) { + wev->posted_ready = 1; + + } else { + wev->ready = 1; + } - if (ngx_posted_events) { - if (ngx_threaded) { - ngx_wakeup_worker_thread(cycle); + if (flags & NGX_POST_EVENTS) { + ngx_locked_post_event(wev, &ngx_posted_events); - } else { - ngx_event_process_posted(cycle); + } else { + wev->handler(wev); + } } } + ngx_mutex_unlock(ngx_posted_events_mutex); + return NGX_OK; } |