Mercurial > hg > nginx-ranges

comparison src/event/modules/ngx_poll_module.c @ 635:e67b227c8dbb default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
260 260
261 ready = poll(event_list, (u_int) nevents, (int) timer); 261 ready = poll(event_list, (u_int) nevents, (int) timer);
262 262
263 err = (ready == -1) ? ngx_errno : 0; 263 err = (ready == -1) ? ngx_errno : 0;
264 264
265 if (flags & NGX_UPDATE_TIME) { 265 if (flags & NGX_UPDATE_TIME || ngx_event_timer_alarm) {
266 ngx_time_update(0, 0); 266 ngx_time_update();
267 } 267 }
268 268
269 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, 269 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
270 "poll ready %d of %d", ready, nevents); 270 "poll ready %d of %d", ready, nevents);
271 271