summaryrefslogtreecommitdiffhomepage
path: root/src/os/unix/ngx_process_cycle.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2010-06-07 10:35:08 +0000
committerIgor Sysoev <igor@sysoev.ru>2010-06-07 10:35:08 +0000
commite66eb15b7be2534c9405900eb7350b538a146905 (patch)
tree9fdde42dc4d05ce8b264225ba9c13ced6b3d8310 /src/os/unix/ngx_process_cycle.c
parentea3aaae636eb194e3dbbc5b9d0c0a51d831e2d4c (diff)
downloadnginx-e66eb15b7be2534c9405900eb7350b538a146905.tar.gz
nginx-e66eb15b7be2534c9405900eb7350b538a146905.tar.bz2
merge r3473, r3474, r3385, r3386, r3537:
signal processing stability: *) use sys_errlist[] in signal handler instead of non Async-Signal-Safe strerror_r() *) do not update time in the timer signal handler, since localtime_r() is not Async-Signal-Safe function *) use previously cached GMT offset value to update time from a signal handler *) change ngx_time_update() interface since there are no notification methods those return time *) introduce ngx_time_sigsafe_update() to update the error log time only *) change ngx_time_update() interface
Diffstat (limited to 'src/os/unix/ngx_process_cycle.c')
-rw-r--r--src/os/unix/ngx_process_cycle.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
index e3b054834..812b36fc4 100644
--- a/src/os/unix/ngx_process_cycle.c
+++ b/src/os/unix/ngx_process_cycle.c
@@ -168,7 +168,7 @@ ngx_master_process_cycle(ngx_cycle_t *cycle)
sigsuspend(&set);
- ngx_time_update(0, 0);
+ ngx_time_update();
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"wake up, sigio %i", sigio);
@@ -1337,7 +1337,7 @@ ngx_cache_manager_process_handler(ngx_event_t *ev)
next = (n <= next) ? n : next;
- ngx_time_update(0, 0);
+ ngx_time_update();
}
}
@@ -1367,7 +1367,7 @@ ngx_cache_loader_process_handler(ngx_event_t *ev)
if (path[i]->loader) {
path[i]->loader(path[i]->data);
- ngx_time_update(0, 0);
+ ngx_time_update();
}
}