Mercurial > hg > nginx-mail
comparison src/event/modules/ngx_kqueue_module.c @ 665:0b460e61bdcd default tip
Merge with nginx 1.0.0.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:22:17 +0400 |
parents | be4f34123024 |
children |
comparison
equal
deleted
inserted
replaced
572:06419a2298a9 | 665:0b460e61bdcd |
---|---|
535 | 535 |
536 events = kevent(ngx_kqueue, change_list, n, event_list, (int) nevents, tp); | 536 events = kevent(ngx_kqueue, change_list, n, event_list, (int) nevents, tp); |
537 | 537 |
538 err = (events == -1) ? ngx_errno : 0; | 538 err = (events == -1) ? ngx_errno : 0; |
539 | 539 |
540 if (flags & NGX_UPDATE_TIME) { | 540 if (flags & NGX_UPDATE_TIME || ngx_event_timer_alarm) { |
541 ngx_time_update(0, 0); | 541 ngx_time_update(); |
542 } | 542 } |
543 | 543 |
544 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, | 544 ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, |
545 "kevent events: %d", events); | 545 "kevent events: %d", events); |
546 | 546 |
587 } | 587 } |
588 | 588 |
589 #if (NGX_HAVE_TIMER_EVENT) | 589 #if (NGX_HAVE_TIMER_EVENT) |
590 | 590 |
591 if (event_list[i].filter == EVFILT_TIMER) { | 591 if (event_list[i].filter == EVFILT_TIMER) { |
592 ngx_time_update(0, 0); | 592 ngx_time_update(); |
593 continue; | 593 continue; |
594 } | 594 } |
595 | 595 |
596 #endif | 596 #endif |
597 | 597 |