nginx: src/event/modules/ngx_kqueue

nginx-0.0.1-2003-01-24-09:20:47 import

comparison

equal deleted inserted replaced

-:b288069a8696
+:a6afbb8a2ada
 u_int            timer, delta;
 ngx_event_t      *ev;
 struct timeval   tv;
 struct timespec  ts, *tp;
+timer = ngx_event_find_timer();
+if (timer) {
+ts.tv_sec = timer / 1000;
+ts.tv_nsec = (timer % 1000) * 1000000;
+tp = &ts;
+gettimeofday(&tv, NULL);
+delta = tv.tv_sec * 1000 + tv.tv_usec / 1000;
+} else {
+timer = 0;
+delta = 0;
+tp = NULL;
+}
+#if 0
 if (timer_queue.timer_next != &timer_queue) {
 timer = timer_queue.timer_next->timer_delta;
 ts.tv_sec = timer / 1000;
 ts.tv_nsec = (timer % 1000) * 1000000;
 tp = &ts;
 } else {
 timer = 0;
 delta = 0;
 tp = NULL;
 }
+#endif
 #if (NGX_DEBUG_EVENT)
 ngx_log_debug(log, "kevent timer: %d" _ timer);
 #endif
 ngx_log_error(NGX_LOG_ALERT, log, 0,
 "unknown kevent filter %d" _ event_list[i].filter);
 }
 }
+if (timer) {
+ngx_event_expire_timers(delta);
+}
+#if 0
 if (timer && timer_queue.timer_next != &timer_queue) {
 if (delta >= timer_queue.timer_next->timer_delta) {
 for ( ;; ) {
 ev = timer_queue.timer_next;
 } else {
 timer_queue.timer_next->timer_delta -= delta;
 }
 }
+#endif
 return NGX_OK;
 }

Mercurial > hg > nginx