Mercurial > hg > nginx
diff src/event/modules/ngx_kqueue_module.c @ 245:e6c005b66b3a
nginx-0.0.1-2004-01-30-00:45:01 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 29 Jan 2004 21:45:01 +0000 |
parents | 5d4f49dc8de5 |
children | 6753e8cdaa2c |
line wrap: on
line diff
--- a/src/event/modules/ngx_kqueue_module.c +++ b/src/event/modules/ngx_kqueue_module.c @@ -339,7 +339,8 @@ static int ngx_kqueue_set_event(ngx_even static int ngx_kqueue_process_events(ngx_log_t *log) { - ngx_int_t events, instance, i; + int events; + ngx_int_t instance, i; ngx_err_t err; ngx_msec_t timer; ngx_event_t *ev; @@ -355,13 +356,7 @@ static int ngx_kqueue_process_events(ngx ts.tv_nsec = (timer % 1000) * 1000000; tp = &ts; -#if 0 - ngx_gettimeofday(&tv); - delta = tv.tv_sec * 1000 + tv.tv_usec / 1000; -#endif - } else { - delta = 0; tp = NULL; } @@ -378,17 +373,17 @@ static int ngx_kqueue_process_events(ngx nchanges = 0; ngx_gettimeofday(&tv); + ngx_time_update(tv.tv_sec); -#if 1 delta = ngx_elapsed_msec; -#endif ngx_elapsed_msec = tv.tv_sec * 1000 + tv.tv_usec / 1000 - ngx_start_msec; - ngx_time_update(tv.tv_sec); - if (timer) { delta = ngx_elapsed_msec - delta; + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0, + "kevent timer: %d, delta: %d", timer, (int) delta); + } else { if (events == 0) { ngx_log_error(NGX_LOG_ALERT, log, 0, @@ -397,9 +392,6 @@ static int ngx_kqueue_process_events(ngx } } - ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0, - "kevent timer: %d, delta: %d", timer, (int) delta); - if (err) { ngx_log_error((err == NGX_EINTR) ? NGX_LOG_INFO : NGX_LOG_ALERT, log, err, "kevent() failed"); @@ -496,33 +488,6 @@ static int ngx_kqueue_process_events(ngx } -#if 0 - -static void ngx_kqueue_thread_handler(ngx_event_t *ev, ngx_log_t *log) -{ - ngx_int_t instance; - - instance = (uintptr_t) ev & 1; - ev = (ngx_event_t *) ((uintptr_t) ev & (uintptr_t) ~1); - - if (ev->active && ev->instance == instance) { - ev->event_handler(ev); - return; - } - - /* - * it's a stale event from a file descriptor - * that was just closed in this iteration - */ - - ngx_log_debug1(NGX_LOG_DEBUG_EVENT, log, 0, - "kevent: stale event " PTR_FMT, ev); - -} - -#endif - - static void *ngx_kqueue_create_conf(ngx_cycle_t *cycle) { ngx_kqueue_conf_t *kcf;