nginx: src/event/modules/ngx_devpoll

comparison src/event/modules/ngx_devpoll_module.c @ 316:a0beefedaf94

nginx-0.0.3-2004-04-15-00:34:05 import

author	Igor Sysoev <igor@sysoev.ru>
date	Wed, 14 Apr 2004 20:34:05 +0000
parents	4b1a3a4acc60
children	1308b98496a2

comparison

equal deleted inserted replaced

-:39b6f2df45c0
+:a0beefedaf94
 if (ngx_devpoll_set_event(ev, POLLREMOVE, flags) == NGX_ERROR) {
 return NGX_ERROR;
 }
 ev->active = 0;
+ev->posted = 0;
 if (flags & NGX_CLOSE_EVENT) {
 return NGX_OK;
 }
 int ngx_devpoll_process_events(ngx_cycle_t *cycle)
 {
 int                 events;
 ngx_int_t           i;
-ngx_uint_t          j;
+ngx_uint_t          j, lock, expire;
 size_t              n;
 ngx_msec_t          timer;
 ngx_err_t           err;
 ngx_cycle_t       **old_cycle;
 ngx_connection_t   *c;
 ngx_epoch_msec_t    delta;
 struct dvpoll       dvp;
 struct timeval      tv;
-timer = ngx_event_find_timer();
+for ( ;; ) {
+timer = ngx_event_find_timer();
+if (timer != 0) {
+break;
+}
+ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
+"devpoll expired timer");
+ngx_event_expire_timers(0);
+}
+/* NGX_TIMER_INFINITE == INFTIM */
+if (timer == NGX_TIMER_INFINITE) {
+expire = 0;
+} else {
+expire = 1;
+}
+if (ngx_accept_mutex) {
+if (ngx_trylock_accept_mutex(cycle) == NGX_ERROR) {
+return NGX_ERROR;
+}
+if (ngx_accept_mutex_held == 0
+&& (timer == NGX_TIMER_INFINITE || timer > ngx_accept_mutex_delay))
+{
+timer = ngx_accept_mutex_delay;
+expire = 0;
+}
+}
 ngx_old_elapsed_msec = ngx_elapsed_msec;
-if (timer == 0) {
-timer = (ngx_msec_t) INFTIM;
-}
 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
 "devpoll timer: %d", timer);
 if (nchanges) {
 n = nchanges * sizeof(struct pollfd);
 if (write(dp, change_list, n) != (ssize_t) n) {
 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
 "write(/dev/poll) failed");
+ngx_accept_mutex_unlock();
 return NGX_ERROR;
 }
 }
 dvp.dp_fds = event_list;
 ngx_elapsed_msec = tv.tv_sec * 1000 + tv.tv_usec / 1000 - ngx_start_msec;
 if (err) {
 ngx_log_error((err == NGX_EINTR) ? NGX_LOG_INFO : NGX_LOG_ALERT,
 cycle->log, err, "ioctl(DP_POLL) failed");
+ngx_accept_mutex_unlock();
 return NGX_ERROR;
 }
-if (timer != (ngx_msec_t) INFTIM) {
+if (timer != NGX_TIMER_INFINITE) {
 delta = ngx_elapsed_msec - delta;
 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
 "devpoll timer: %d, delta: %d", timer, (int) delta);
 } else {
 if (events == 0) {
 ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
 "ioctl(DP_POLL) returned no events without timeout");
+ngx_accept_mutex_unlock();
 return NGX_ERROR;
 }
 }
+if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
+ngx_accept_mutex_unlock();
+return NGX_ERROR;
+}
+lock = 1;
 for (i = 0; i < events; i++) {
 c = &ngx_cycle->connections[event_list[i].fd];
 if (c->fd == -1) {
 "fd:%d ev:%04X rev:%04X",
 event_list[i].fd,
 event_list[i].events, event_list[i].revents);
 }
+if ((event_list[i].events & (POLLOUT|POLLERR|POLLHUP))
+&& c->write->active)
+{
+c->write->ready = 1;
+if (!ngx_threaded && !ngx_accept_mutex_held) {
+c->write->event_handler(c->write);
+} else {
+ngx_post_event(c->write);
+}
+}
+/*
+* POLLIN must be handled after POLLOUT because we use
+* the optimization to avoid the unnecessary mutex locking/unlocking
+* if the accept event is the last one.
+*/
 if ((event_list[i].events & (POLLIN|POLLERR|POLLHUP))
 && c->read->active)
 {
 c->read->ready = 1;
-c->read->event_handler(c->read);
-}
+if (!ngx_threaded && !ngx_accept_mutex_held) {
+c->read->event_handler(c->read);
-if ((event_list[i].events & (POLLOUT|POLLERR|POLLHUP))
-&& c->write->active)
+} else if (!c->read->accept) {
-{
+ngx_post_event(c->read);
-c->write->ready = 1;
-c->write->event_handler(c->write);
+} else {
-}
+ngx_mutex_unlock(ngx_posted_events_mutex);
-}
+c->read->event_handler(c->read);
-if (timer != (ngx_msec_t) INFTIM && delta) {
+if (i + 1 == events) {
+lock = 0;
+break;
+}
+if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
+ngx_accept_mutex_unlock();
+return NGX_ERROR;
+}
+}
+}
+}
+if (lock) {
+ngx_mutex_unlock(ngx_posted_events_mutex);
+}
+ngx_accept_mutex_unlock();
+if (expire && delta) {
 ngx_event_expire_timers((ngx_msec_t) delta);
+}
+if (!ngx_threaded) {
+ngx_event_process_posted(cycle);
 }
 return NGX_OK;
 }

Mercurial > hg > nginx

comparison src/event/modules/ngx_devpoll_module.c @ 316:a0beefedaf94