# HG changeset patch # User Ruslan Ermilov # Date 1426796418 -10800 # Node ID 67717d4e4f47e1b3927c128621bfe30b7541351d # Parent 25fda43e3bcb92b4bd43d1a17b9ef9086280796c 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. diff --git a/src/core/ngx_thread_pool.c b/src/core/ngx_thread_pool.c --- 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_po 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_ { /* 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); }