commit 62260f2a158e27e5f6b1689e10dc25ea3c617473
author Igor Sysoev <igor@sysoev.ru> Fri Dec 05 17:07:27 2003 +0000
committer Igor Sysoev <igor@sysoev.ru> Fri Dec 05 17:07:27 2003 +0000
tree d37c7d3f837c9f477a5010adedcbe98be89e735c
parent faca119aa5b2375d247c4948ba6791e7d8d2b8bc

nginx-0.0.1-2003-12-05-20:07:27 import

src/event/modules/ngx_kqueue_module.c

diff --git a/src/event/modules/ngx_kqueue_module.c b/src/event/modules/ngx_kqueue_module.c
index 393c4d1..e438ad3 100644
--- a/src/event/modules/ngx_kqueue_module.c
+++ b/src/event/modules/ngx_kqueue_module.c
@@ -354,6 +354,7 @@
     struct timespec    ts, *tp;
 
     timer = ngx_event_find_timer();
+    ngx_old_elapsed_msec = ngx_elapsed_msec;
 
     if (timer) {
         ts.tv_sec = timer / 1000;
@@ -399,19 +400,6 @@
     if (timer) {
         delta = ngx_elapsed_msec - delta;
 
-#if 0
-        delta = tv.tv_sec * 1000 + tv.tv_usec / 1000 - delta;
-
-        /*
-         * The expired timers must be handled before a processing of the events
-         * because the new timers can be added during a processing
-         */
-
-        ngx_event_expire_timers((ngx_msec_t) delta);
-
-        ngx_event_set_timer_delta((ngx_msec_t) delta);
-#endif
-
     } else {
         if (events == 0) {
             ngx_log_error(NGX_LOG_ALERT, log, 0,
@@ -519,12 +507,6 @@
         ngx_event_expire_timers((ngx_msec_t) delta);
     }
 
-#if 0
-    if (timer) {
-        ngx_event_expire_timers((ngx_msec_t) delta);
-    }
-#endif
-
     return NGX_OK;
 }