From a21e30b91900dbbde5ea7fbc5ed4b2ec59969de7 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 13 Apr 2004 05:27:03 +0000 Subject: nginx-0.0.3-2004-04-13-09:27:03 import --- src/event/modules/ngx_epoll_module.c | 10 +++++----- src/event/ngx_event_accept.c | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/event') diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index ab0c19260..f4e993676 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -434,10 +434,6 @@ int ngx_epoll_process_events(ngx_cycle_t *cycle) c->write->returned_instance = instance; } -#if (NGX_DEBUG) - log = c->log ? c->log : cycle->log; -#endif - if (c->read->instance != instance) { /* @@ -445,11 +441,15 @@ int ngx_epoll_process_events(ngx_cycle_t *cycle) * that was just closed in this iteration */ - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0, + ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "epoll: stale event " PTR_FMT, c); continue; } +#if (NGX_DEBUG) + log = c->log ? c->log : cycle->log; +#endif + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0, "epoll: fd:%d ev:%04X d:" PTR_FMT, c->fd, event_list[i].events, event_list[i].data); diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c index 235ff7fc7..07fc6a325 100644 --- a/src/event/ngx_event_accept.c +++ b/src/event/ngx_event_accept.c @@ -328,7 +328,6 @@ ngx_int_t ngx_trylock_accept_mutex(ngx_cycle_t *cycle) if (*ngx_accept_mutex == 0 && ngx_atomic_cmp_set(ngx_accept_mutex, 0, ngx_pid)) { - ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "accept mutex locked"); -- cgit