From c34368715f9e6639f11e9c1a70272668085d6886 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Thu, 19 Mar 2015 23:20:18 +0300 Subject: Thread pools: silence warning on process exit. Work around pthread_cond_destroy() and pthread_mutex_destroy() returning EBUSY. A proper solution would be to ensure all threads are terminated. --- src/core/ngx_thread_pool.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/core/ngx_thread_pool.c b/src/core/ngx_thread_pool.c index d6e85202f..5bc6153e0 100644 --- a/src/core/ngx_thread_pool.c +++ b/src/core/ngx_thread_pool.c @@ -172,7 +172,11 @@ ngx_thread_pool_queue_init(ngx_thread_pool_queue_t *queue, ngx_log_t *log) static ngx_int_t 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); +#else + return NGX_OK; +#endif } @@ -181,7 +185,10 @@ ngx_thread_pool_destroy(ngx_thread_pool_t *tp) { /* TODO: exit threads */ +#if 0 (void) ngx_thread_cond_destroy(&tp->cond, tp->log); +#endif + (void) ngx_thread_pool_queue_destroy(&tp->queue, tp->log); } -- cgit