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

Thread pools: keep waiting tasks counter in ngx_thread_pool_t.

Browse Source 
It's not needed for completed tasks queue.

No functional changes.
This commit is contained in:
Ruslan Ermilov 2015-03-19 23:19:35 +03:00
parent 85048c0397
commit 20d07074e3
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/ngx_thread_pool.c
View File

@ -18,16 +18,15 @@ typedef struct {
typedef struct { typedef struct {
ngx_thread_mutex_t mtx; ngx_thread_mutex_t mtx;
ngx_uint_t count;
ngx_thread_task_t *first; ngx_thread_task_t *first;
ngx_thread_task_t **last; ngx_thread_task_t **last;
} ngx_thread_pool_queue_t; } ngx_thread_pool_queue_t;
struct ngx_thread_pool_s { struct ngx_thread_pool_s {
ngx_thread_cond_t cond;
ngx_thread_pool_queue_t queue; ngx_thread_pool_queue_t queue;
ngx_uint_t waiting;
ngx_thread_cond_t cond;
ngx_log_t *log; ngx_log_t *log;
ngx_pool_t *pool; ngx_pool_t *pool;
@ -163,7 +162,6 @@ ngx_thread_pool_init(ngx_thread_pool_t *tp, ngx_log_t *log, ngx_pool_t *pool)
static ngx_int_t static ngx_int_t
ngx_thread_pool_queue_init(ngx_thread_pool_queue_t *queue, ngx_log_t *log) ngx_thread_pool_queue_init(ngx_thread_pool_queue_t *queue, ngx_log_t *log)
{ {
queue->count = 0;
queue->first = NULL; queue->first = NULL;
queue->last = &queue->first; queue->last = &queue->first;
@ -217,12 +215,12 @@ ngx_thread_task_post(ngx_thread_pool_t *tp, ngx_thread_task_t *task)
return NGX_ERROR; return NGX_ERROR;
} }
if (tp->queue.count >= tp->max_queue) { if (tp->waiting >= tp->max_queue) {
(void) ngx_thread_mutex_unlock(&tp->queue.mtx, tp->log); (void) ngx_thread_mutex_unlock(&tp->queue.mtx, tp->log);
ngx_log_error(NGX_LOG_ERR, tp->log, 0, ngx_log_error(NGX_LOG_ERR, tp->log, 0,
"thread pool \"%V\" queue overflow: %ui tasks waiting", "thread pool \"%V\" queue overflow: %ui tasks waiting",
&tp->name, tp->queue.count); &tp->name, tp->waiting);
return NGX_ERROR; return NGX_ERROR;
} }
@ -239,7 +237,7 @@ ngx_thread_task_post(ngx_thread_pool_t *tp, ngx_thread_task_t *task)
*tp->queue.last = task; *tp->queue.last = task;
tp->queue.last = &task->next; tp->queue.last = &task->next;
tp->queue.count++; tp->waiting++;
(void) ngx_thread_mutex_unlock(&tp->queue.mtx, tp->log); (void) ngx_thread_mutex_unlock(&tp->queue.mtx, tp->log);
@ -285,7 +283,7 @@ ngx_thread_pool_cycle(void *data)
return NULL; return NULL;
} }
while (tp->queue.count == 0) { while (tp->waiting == 0) {
if (ngx_thread_cond_wait(&tp->cond, &tp->queue.mtx, tp->log) if (ngx_thread_cond_wait(&tp->cond, &tp->queue.mtx, tp->log)
!= NGX_OK) != NGX_OK)
{ {
@ -294,7 +292,7 @@ ngx_thread_pool_cycle(void *data)
} }
} }
tp->queue.count--; tp->waiting--;
task = tp->queue.first; task = tp->queue.first;
tp->queue.first = task->next; tp->queue.first = task->next;