Mercurial > hg > nginx

changeset 6027:67717d4e4f47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 19 Mar 2015 23:20:18 +0300
parents 25fda43e3bcb
children fa77496b1df2
files src/core/ngx_thread_pool.c
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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);
 }