diff --git a/app/nginx-1.11.10/src/event/modules/ngx_ff_host_event_module.c b/app/nginx-1.11.10/src/event/modules/ngx_ff_host_event_module.c index 311cffb7..ac5e3f83 100644 --- a/app/nginx-1.11.10/src/event/modules/ngx_ff_host_event_module.c +++ b/app/nginx-1.11.10/src/event/modules/ngx_ff_host_event_module.c @@ -332,10 +332,10 @@ ngx_ff_epoll_process_events(ngx_cycle_t *cycle, ngx_connection_t *c; /* NGX_TIMER_INFINITE == INFTIM */ - +/* ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "epoll timer: %M", timer); - +*/ events = epoll_wait(ep, event_list, (int) nevents, timer); err = (events == -1) ? ngx_errno : 0; diff --git a/app/nginx-1.11.10/src/event/modules/ngx_kqueue_module.c b/app/nginx-1.11.10/src/event/modules/ngx_kqueue_module.c index fc84e191..12a7dc71 100644 --- a/app/nginx-1.11.10/src/event/modules/ngx_kqueue_module.c +++ b/app/nginx-1.11.10/src/event/modules/ngx_kqueue_module.c @@ -534,8 +534,15 @@ ngx_kqueue_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, tp = &ts; } +#if (NGX_HAVE_FSTACK) + if (n > 0) { + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, + "kevent timer: %M, changes: %d", timer, n); + } +#else ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "kevent timer: %M, changes: %d", timer, n); +#endif events = kevent(ngx_kqueue, change_list, n, event_list, (int) nevents, tp); @@ -545,8 +552,10 @@ ngx_kqueue_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_time_update(); } +#if !(NGX_HAVE_FSTACK) ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "kevent events: %d", events); +#endif if (err) { if (err == NGX_EINTR) { diff --git a/app/nginx-1.11.10/src/event/ngx_event.c b/app/nginx-1.11.10/src/event/ngx_event.c index 79f74162..01a2fe99 100644 --- a/app/nginx-1.11.10/src/event/ngx_event.c +++ b/app/nginx-1.11.10/src/event/ngx_event.c @@ -252,6 +252,8 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle) (void) ngx_process_events(cycle, timer, flags); + delta = ngx_current_msec - delta; + #if (NGX_HAVE_FSTACK) /* handle message from kernel (PS: signals from master) in case of network inactivity */ if (ngx_current_msec - initial >= ngx_schedule_timeout) { @@ -260,13 +262,10 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle) /* Update timer*/ initial = ngx_current_msec; } -#endif - - delta = ngx_current_msec - delta; - +#else ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "timer delta: %M", delta); - +#endif ngx_event_process_posted(cycle, &ngx_posted_accept_events); if (ngx_accept_mutex_held) { diff --git a/app/nginx-1.11.10/src/os/unix/ngx_process_cycle.c b/app/nginx-1.11.10/src/os/unix/ngx_process_cycle.c index 34c90291..aea167ac 100644 --- a/app/nginx-1.11.10/src/os/unix/ngx_process_cycle.c +++ b/app/nginx-1.11.10/src/os/unix/ngx_process_cycle.c @@ -829,7 +829,7 @@ ngx_worker_process_cycle_loop(void *arg) } } - ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "worker cycle"); + //ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "worker cycle"); ngx_process_events_and_timers(cycle);