Mercurial > hg > nginx-mail
comparison src/event/modules/ngx_devpoll_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 |
---|---|
369 dvp.dp_timeout = timer; | 369 dvp.dp_timeout = timer; |
370 events = ioctl(dp, DP_POLL, &dvp); | 370 events = ioctl(dp, DP_POLL, &dvp); |
371 | 371 |
372 err = (events == -1) ? ngx_errno : 0; | 372 err = (events == -1) ? ngx_errno : 0; |
373 | 373 |
374 if (flags & NGX_UPDATE_TIME) { | 374 if (flags & NGX_UPDATE_TIME || ngx_event_timer_alarm) { |
375 ngx_time_update(0, 0); | 375 ngx_time_update(); |
376 } | 376 } |
377 | 377 |
378 if (err) { | 378 if (err) { |
379 if (err == NGX_EINTR) { | 379 if (err == NGX_EINTR) { |
380 | 380 |