Mercurial > hg > nginx
diff src/event/modules/ngx_epoll_module.c @ 3902:159b58f9c0bd
fix building by gcc 4.6 without --with-debug
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sat, 23 Apr 2011 17:25:06 +0000 |
parents | ab353d7dc182 |
children | 6903dac6ad19 c48662671609 |
line wrap: on
line diff
--- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -518,7 +518,6 @@ ngx_epoll_process_events(ngx_cycle_t *cy ngx_int_t instance, i; ngx_uint_t level; ngx_err_t err; - ngx_log_t *log; ngx_event_t *rev, *wev, **queue; ngx_connection_t *c; @@ -565,8 +564,6 @@ ngx_epoll_process_events(ngx_cycle_t *cy ngx_mutex_lock(ngx_posted_events_mutex); - log = cycle->log; - for (i = 0; i < events; i++) { c = event_list[i].data.ptr; @@ -587,25 +584,21 @@ ngx_epoll_process_events(ngx_cycle_t *cy continue; } -#if (NGX_DEBUG0) - log = c->log ? c->log : cycle->log; -#endif - revents = event_list[i].events; - ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0, + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "epoll: fd:%d ev:%04XD d:%p", c->fd, revents, event_list[i].data.ptr); if (revents & (EPOLLERR|EPOLLHUP)) { - ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0, + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "epoll_wait() error on fd:%d ev:%04XD", c->fd, revents); } #if 0 if (revents & ~(EPOLLIN|EPOLLOUT|EPOLLERR|EPOLLHUP)) { - ngx_log_error(NGX_LOG_ALERT, log, 0, + ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "strange epoll_wait() events fd:%d ev:%04XD", c->fd, revents); }