Mercurial > hg > nginx-ranges

comparison src/event/modules/ngx_eventport_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
403 n = port_getn(ep, event_list, (u_int) nevents, &events, tp); 403 n = port_getn(ep, event_list, (u_int) nevents, &events, tp);
404 404
405 err = ngx_errno; 405 err = ngx_errno;
406 406
407 if (flags & NGX_UPDATE_TIME) { 407 if (flags & NGX_UPDATE_TIME) {
408 ngx_time_update(0, 0); 408 ngx_time_update();
409 } 409 }
410 410
411 if (n == -1) { 411 if (n == -1) {
412 if (err == ETIME) { 412 if (err == ETIME) {
413 if (timer != NGX_TIMER_INFINITE) { 413 if (timer != NGX_TIMER_INFINITE) {
437 ngx_mutex_lock(ngx_posted_events_mutex); 437 ngx_mutex_lock(ngx_posted_events_mutex);
438 438
439 for (i = 0; i < events; i++) { 439 for (i = 0; i < events; i++) {
440 440
441 if (event_list[i].portev_source == PORT_SOURCE_TIMER) { 441 if (event_list[i].portev_source == PORT_SOURCE_TIMER) {
442 ngx_time_update(0, 0); 442 ngx_time_update();
443 continue; 443 continue;
444 } 444 }
445 445
446 ev = event_list[i].portev_user; 446 ev = event_list[i].portev_user;
447 447