mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 09:42:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win32: fixed cpu hog by cache manager on exit (ticket #514).

Browse Source 
The "ngx_quit" may be reset by the worker thread before it's seen
by a ngx_cache_manager_thread(), resulting in an infinite loop.  Make
sure to test ngx_exiting as well.
This commit is contained in:
Maxim Dounin 2014-03-31 21:38:28 +04:00
parent e042fc9038
commit 8f6958baa9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/os/win32/ngx_process_cycle.c
View File

@ -926,7 +926,7 @@ ngx_cache_manager_thread(void *data)
* ev == WAIT_ABANDONED_0 + 1 * ev == WAIT_ABANDONED_0 + 1
*/ */
if (ngx_terminate || ngx_quit) { if (ngx_terminate || ngx_quit || ngx_exiting) {
ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting"); ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
return 0; return 0;
} }
@ -936,7 +936,7 @@ ngx_cache_manager_thread(void *data)
for ( ;; ) { for ( ;; ) {
if (ngx_terminate || ngx_quit) { if (ngx_terminate || ngx_quit || ngx_exiting) {
ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting"); ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
break; break;
} }
@ -1005,7 +1005,7 @@ ngx_cache_loader_thread(void *data)
path = cycle->paths.elts; path = cycle->paths.elts;
for (i = 0; i < cycle->paths.nelts; i++) { for (i = 0; i < cycle->paths.nelts; i++) {
if (ngx_terminate || ngx_quit) { if (ngx_terminate || ngx_quit || ngx_exiting) {
break; break;
} }