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

Thread pools: silence warning on process exit.

Browse Source 
Work around pthread_cond_destroy() and pthread_mutex_destroy() returning
EBUSY.  A proper solution would be to ensure all threads are terminated.
This commit is contained in:
Ruslan Ermilov 2015-03-19 23:20:18 +03:00
parent afe1fcffaa
commit c34368715f
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/ngx_thread_pool.c
View File

@ -172,7 +172,11 @@ ngx_thread_pool_queue_init(ngx_thread_pool_queue_t *queue, ngx_log_t *log)
static ngx_int_t static ngx_int_t
ngx_thread_pool_queue_destroy(ngx_thread_pool_queue_t *queue, ngx_log_t *log) ngx_thread_pool_queue_destroy(ngx_thread_pool_queue_t *queue, ngx_log_t *log)
{ {
#if 0
return ngx_thread_mutex_destroy(&queue->mtx, log); return ngx_thread_mutex_destroy(&queue->mtx, log);
#else
return NGX_OK;
#endif
} }
@ -181,7 +185,10 @@ ngx_thread_pool_destroy(ngx_thread_pool_t *tp)
{ {
/* TODO: exit threads */ /* TODO: exit threads */
#if 0
(void) ngx_thread_cond_destroy(&tp->cond, tp->log); (void) ngx_thread_cond_destroy(&tp->cond, tp->log);
#endif
(void) ngx_thread_pool_queue_destroy(&tp->queue, tp->log); (void) ngx_thread_pool_queue_destroy(&tp->queue, tp->log);
} }