Mercurial > hg > nginx-ranges
comparison src/event/modules/ngx_devpoll_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 |
|---|---|
| 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 |