Mercurial > hg > nginx
diff src/event/modules/ngx_kqueue_module.c @ 12:055ed05235ae
nginx-0.0.1-2002-09-13-18:47:42 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 13 Sep 2002 14:47:42 +0000 |
parents | f323b4f74e4a |
children | f8a0d0f31a24 |
line wrap: on
line diff
--- a/src/event/modules/ngx_kqueue_module.c +++ b/src/event/modules/ngx_kqueue_module.c @@ -34,9 +34,10 @@ void ngx_kqueue_init(int max_connections nchanges = 0; nevents = 512; - if ((kq = kqueue()) == -1) { - ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, - "kqueue() failed"); + kq = kqueue(); + + if (kq == -1) { + ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "kqueue() failed"); exit(1); } @@ -52,7 +53,6 @@ void ngx_kqueue_init(int max_connections ngx_event_actions.timer = ngx_kqueue_add_timer; ngx_event_actions.process = ngx_kqueue_process_events; #endif - } int ngx_kqueue_add_event(ngx_event_t *ev, int event, u_int flags) @@ -72,7 +72,7 @@ int ngx_kqueue_set_event(ngx_event_t *ev struct timespec ts = { 0, 0 }; ngx_connection_t *cn = (ngx_connection_t *) ev->data; - ngx_log_debug(ev->log, "ngx_kqueue_set_event: %d: ft:%d f:%08x" _ + ngx_log_debug(ev->log, "kqueue set event: %d: ft:%d f:%08x" _ cn->fd _ filter _ flags); if (nchanges >= nevents) { @@ -80,9 +80,8 @@ int ngx_kqueue_set_event(ngx_event_t *ev "ngx_kqueue_set_event: change list is filled up"); if (kevent(kq, change_list, nchanges, NULL, 0, &ts) == -1) { - ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno, - "ngx_kqueue_set_event: kevent failed"); - return -1; + ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno, "kevent failed"); + return NGX_ERROR; } nchanges = 0; } @@ -95,7 +94,7 @@ int ngx_kqueue_set_event(ngx_event_t *ev change_list[nchanges].udata = ev; nchanges++; - return 0; + return NGX_OK; } int ngx_kqueue_process_events(ngx_log_t *log) @@ -115,13 +114,12 @@ int ngx_kqueue_process_events(ngx_log_t delta = tv.tv_sec * 1000 + tv.tv_usec / 1000; } - ngx_log_debug(log, "ngx_kqueue_process_events: timer: %d" _ timer); + ngx_log_debug(log, "kevent timer: %d" _ timer); - if ((events = kevent(kq, change_list, nchanges, event_list, nevents, tp)) - == -1) { - ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, - "ngx_kqueue_process_events: kevent failed"); - return -1; + events = kevent(kq, change_list, nchanges, event_list, nevents, tp); + if (events == -1) { + ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "kevent failed"); + return NGX_ERROR; } nchanges = 0; @@ -131,13 +129,11 @@ int ngx_kqueue_process_events(ngx_log_t delta = tv.tv_sec * 1000 + tv.tv_usec / 1000 - delta; } else { - ngx_assert((events != 0), return -1, log, - "ngx_kqueue_process_events: " + ngx_assert((events != 0), return NGX_ERROR, log, "kevent returns no events without timeout"); } - ngx_log_debug(log, "ngx_kqueue_process_events: " - "timer: %d, delta: %d" _ timer _ delta); + ngx_log_debug(log, "kevent timer: %d, delta: %d" _ timer _ delta); if (timer) { if (delta >= timer) { @@ -161,16 +157,14 @@ int ngx_kqueue_process_events(ngx_log_t for (i = 0; i < events; i++) { - ngx_log_debug(log, "ngx_kqueue_process_events: kevent: " - "%d: ft:%d f:%08x ff:%08x d:%d ud:%08x" _ + ngx_log_debug(log, "kevent: %d: ft:%d f:%08x ff:%08x d:%d ud:%08x" _ event_list[i].ident _ event_list[i].filter _ event_list[i].flags _ event_list[i].fflags _ event_list[i].data _ event_list[i].udata); if (event_list[i].flags & EV_ERROR) { ngx_log_error(NGX_LOG_ALERT, log, event_list[i].data, - "ngx_kqueue_process_events: kevent error on %d", - event_list[i].ident); + "kevent error on %d", event_list[i].ident); continue; } @@ -198,12 +192,11 @@ int ngx_kqueue_process_events(ngx_log_t default: ngx_assert(0, /* void */, log, - "ngx_kqueue_process_events: unknown filter %d" _ - event_list[i].filter); + "unknown kevent filter %d" _ event_list[i].filter); } } - return 0; + return NGX_OK; } void ngx_kqueue_add_timer(ngx_event_t *ev, ngx_msec_t timer)