Mercurial > hg > nginx
comparison src/os/win32/ngx_process.c @ 3587:e1409e56ba7c stable-0.7
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
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 07 Jun 2010 10:35:08 +0000 |
parents | 1f3cd08ebb82 |
children |
comparison
equal
deleted
inserted
replaced
3586:2d21e02fc01d | 3587:e1409e56ba7c |
---|---|
83 events[0] = ngx_master_process_event; | 83 events[0] = ngx_master_process_event; |
84 events[1] = ctx.child; | 84 events[1] = ctx.child; |
85 | 85 |
86 rc = WaitForMultipleObjects(2, events, 0, 5000); | 86 rc = WaitForMultipleObjects(2, events, 0, 5000); |
87 | 87 |
88 ngx_time_update(0, 0); | 88 ngx_time_update(); |
89 | 89 |
90 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0, | 90 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0, |
91 "WaitForMultipleObjects: %ul", rc); | 91 "WaitForMultipleObjects: %ul", rc); |
92 | 92 |
93 switch (rc) { | 93 switch (rc) { |