Mercurial > hg > nginx-ranges
comparison src/event/modules/ngx_epoll_module.c @ 635:e67b227c8dbb default tip
Merge with current.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:07:55 +0400 |
parents | be4f34123024 |
children |
comparison
equal
deleted
inserted
replaced
578:f3a9e57d2e17 | 635:e67b227c8dbb |
---|---|
529 | 529 |
530 events = epoll_wait(ep, event_list, (int) nevents, timer); | 530 events = epoll_wait(ep, event_list, (int) nevents, timer); |
531 | 531 |
532 err = (events == -1) ? ngx_errno : 0; | 532 err = (events == -1) ? ngx_errno : 0; |
533 | 533 |
534 if (flags & NGX_UPDATE_TIME) { | 534 if (flags & NGX_UPDATE_TIME || ngx_event_timer_alarm) { |
535 ngx_time_update(0, 0); | 535 ngx_time_update(); |
536 } | 536 } |
537 | 537 |
538 if (err) { | 538 if (err) { |
539 if (err == NGX_EINTR) { | 539 if (err == NGX_EINTR) { |
540 | 540 |