mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-12 10:19:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Thread pools: replaced completed tasks queue mutex with spinlock.

Browse Source
This commit is contained in:
Valentin Bartenev 2015-03-23 17:51:21 +03:00
parent 07de3f538b
commit f109a68b4f
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/ngx_thread_pool.c
View File

@ -99,6 +99,7 @@ ngx_module_t ngx_thread_pool_module = {
static ngx_str_t ngx_thread_pool_default = ngx_string("default"); static ngx_str_t ngx_thread_pool_default = ngx_string("default");
static ngx_uint_t ngx_thread_pool_task_id; static ngx_uint_t ngx_thread_pool_task_id;
static ngx_atomic_t ngx_thread_pool_done_lock;
static ngx_thread_pool_queue_t ngx_thread_pool_done; static ngx_thread_pool_queue_t ngx_thread_pool_done;
@ -329,20 +330,12 @@ ngx_thread_pool_cycle(void *data)
task->next = NULL; task->next = NULL;
if (ngx_thread_mutex_lock(&ngx_thread_pool_done.mtx, tp->log) ngx_spinlock(&ngx_thread_pool_done_lock, 1, 2048);
!= NGX_OK)
{
return NULL;
}
*ngx_thread_pool_done.last = task; *ngx_thread_pool_done.last = task;
ngx_thread_pool_done.last = &task->next; ngx_thread_pool_done.last = &task->next;
if (ngx_thread_mutex_unlock(&ngx_thread_pool_done.mtx, tp->log) ngx_unlock(&ngx_thread_pool_done_lock);
!= NGX_OK)
{
return NULL;
}
(void) ngx_notify(ngx_thread_pool_handler); (void) ngx_notify(ngx_thread_pool_handler);
} }
@ -357,17 +350,13 @@ ngx_thread_pool_handler(ngx_event_t *ev)
ngx_log_debug0(NGX_LOG_DEBUG_CORE, ev->log, 0, "thread pool handler"); ngx_log_debug0(NGX_LOG_DEBUG_CORE, ev->log, 0, "thread pool handler");
if (ngx_thread_mutex_lock(&ngx_thread_pool_done.mtx, ev->log) != NGX_OK) { ngx_spinlock(&ngx_thread_pool_done_lock, 1, 2048);
return;
}
task = ngx_thread_pool_done.first; task = ngx_thread_pool_done.first;
ngx_thread_pool_done.first = NULL; ngx_thread_pool_done.first = NULL;
ngx_thread_pool_done.last = &ngx_thread_pool_done.first; ngx_thread_pool_done.last = &ngx_thread_pool_done.first;
if (ngx_thread_mutex_unlock(&ngx_thread_pool_done.mtx, ev->log) != NGX_OK) { ngx_unlock(&ngx_thread_pool_done_lock);
return;
}
while (task) { while (task) {
ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0,