Mercurial > hg > nginx

comparison src/event/modules/ngx_epoll_module.c @ 315:39b6f2df45c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.3-2004-04-14-21:44:28 import
author Igor Sysoev <igor@sysoev.ru>
date Wed, 14 Apr 2004 17:44:28 +0000
parents 98f1a8028067
children a0beefedaf94
comparison
equal deleted inserted replaced
314:d71c87d11b16 315:39b6f2df45c0
354 ngx_epoch_msec_t delta; 354 ngx_epoch_msec_t delta;
355 355
356 timer = ngx_event_find_timer(); 356 timer = ngx_event_find_timer();
357 ngx_old_elapsed_msec = ngx_elapsed_msec; 357 ngx_old_elapsed_msec = ngx_elapsed_msec;
358 358
359 if (timer == 0) { 359 if (timer == -1) {
360 timer = 0;
361 expire = 1;
362
363 } else if (timer == 0) {
360 timer = (ngx_msec_t) -1; 364 timer = (ngx_msec_t) -1;
361 expire = 0; 365 expire = 0;
362 366
363 } else { 367 } else {
364 expire = 1; 368 expire = 1;
367 if (ngx_accept_mutex) { 371 if (ngx_accept_mutex) {
368 if (ngx_trylock_accept_mutex(cycle) == NGX_ERROR) { 372 if (ngx_trylock_accept_mutex(cycle) == NGX_ERROR) {
369 return NGX_ERROR; 373 return NGX_ERROR;
370 } 374 }
371 375
372 if (ngx_accept_mutex_held == 0 && timer > ngx_accept_mutex_delay) { 376 if (ngx_accept_mutex_held == 0
377 && (timer == -1 || timer > ngx_accept_mutex_delay))
378 {
373 timer = ngx_accept_mutex_delay; 379 timer = ngx_accept_mutex_delay;
374 expire = 0; 380 expire = 0;
375 } 381 }
376 } 382 }
377 383