diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-03-25 09:10:10 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-03-25 09:10:10 +0000 |
| commit | 6d45d8a50da07591ed0de584bba1e526cc9b9406 (patch) | |
| tree | 7ec3bc90902c6ddd64df14ee89e152cd452e229f /src/os/win32 | |
| parent | 2f916a972139be74d437e40bdc7d236401123170 (diff) | |
| download | nginx-6d45d8a50da07591ed0de584bba1e526cc9b9406.tar.gz nginx-6d45d8a50da07591ed0de584bba1e526cc9b9406.tar.bz2 | |
*) introduce ngx_time_sigsafe_update() to update the error log time only
*) change ngx_time_update() interface
Diffstat (limited to '')
| -rw-r--r-- | src/os/win32/ngx_process.c | 2 | ||||
| -rw-r--r-- | src/os/win32/ngx_process_cycle.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/os/win32/ngx_process.c b/src/os/win32/ngx_process.c index 08d9c0ecf..f4d372bd6 100644 --- a/src/os/win32/ngx_process.c +++ b/src/os/win32/ngx_process.c @@ -85,7 +85,7 @@ ngx_spawn_process(ngx_cycle_t *cycle, char *name, ngx_int_t respawn) rc = WaitForMultipleObjects(2, events, 0, 5000); - ngx_time_update(0); + ngx_time_update(); ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0, "WaitForMultipleObjects: %ul", rc); diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c index e4e92b85c..5e9d32cef 100644 --- a/src/os/win32/ngx_process_cycle.c +++ b/src/os/win32/ngx_process_cycle.c @@ -140,7 +140,7 @@ ngx_master_process_cycle(ngx_cycle_t *cycle) ev = WaitForMultipleObjects(nev, events, 0, timeout); err = ngx_errno; - ngx_time_update(0); + ngx_time_update(); ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0, "master WaitForMultipleObjects: %ul", ev); @@ -679,7 +679,7 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, char *mevn) ev = WaitForMultipleObjects(3, events, 0, INFINITE); err = ngx_errno; - ngx_time_update(0); + ngx_time_update(); ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "worker WaitForMultipleObjects: %ul", ev); @@ -738,7 +738,7 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, char *mevn) ev = WaitForMultipleObjects(nev, events, 0, INFINITE); err = ngx_errno; - ngx_time_update(0); + ngx_time_update(); ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "worker exit WaitForMultipleObjects: %ul", ev); @@ -907,7 +907,7 @@ ngx_cache_manager_thread(void *data) ev = WaitForMultipleObjects(2, events, 0, INFINITE); err = ngx_errno; - ngx_time_update(0); + ngx_time_update(); ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0, "cache manager WaitForMultipleObjects: %ul", ev); @@ -968,7 +968,7 @@ ngx_cache_manager_process_handler(void) next = (n <= next) ? n : next; - ngx_time_update(0); + ngx_time_update(); } } @@ -980,7 +980,7 @@ ngx_cache_manager_process_handler(void) if (ev != WAIT_TIMEOUT) { - ngx_time_update(0); + ngx_time_update(); ngx_log_debug1(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, "cache manager WaitForSingleObject: %ul", ev); @@ -1008,7 +1008,7 @@ ngx_cache_loader_thread(void *data) if (path[i]->loader) { path[i]->loader(path[i]->data); - ngx_time_update(0); + ngx_time_update(); } } |