RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-26 23:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: tasks: use atomic ops for active_tasks_mask

Browse Source 
We don't have the lock anymore so we need to protect it.
This commit is contained in:
Willy Tarreau 2018-07-26 15:16:43 +02:00
parent e85ee7b663
commit 189ea856a7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/task.c
View File

@ -118,7 +118,7 @@ redo:
return; return;
} }
HA_ATOMIC_ADD(&tasks_run_queue, 1); HA_ATOMIC_ADD(&tasks_run_queue, 1);
active_tasks_mask |= t->thread_mask; HA_ATOMIC_OR(&active_tasks_mask, t->thread_mask);
t->rq.key = HA_ATOMIC_ADD(&rqueue_ticks, 1); t->rq.key = HA_ATOMIC_ADD(&rqueue_ticks, 1);
if (likely(t->nice)) { if (likely(t->nice)) {
@ -302,7 +302,7 @@ void process_runnable_tasks()
return; return;
} }
} }
active_tasks_mask &= ~tid_bit; HA_ATOMIC_AND(&active_tasks_mask, ~tid_bit);
/* Get some tasks from the run queue, make sure we don't /* Get some tasks from the run queue, make sure we don't
* get too much in the task list, but put a bit more than * get too much in the task list, but put a bit more than
* the max that will be run, to give a bit more fairness * the max that will be run, to give a bit more fairness
@ -381,7 +381,7 @@ void process_runnable_tasks()
max_processed--; max_processed--;
if (max_processed <= 0) { if (max_processed <= 0) {
active_tasks_mask |= tid_bit; HA_ATOMIC_OR(&active_tasks_mask, tid_bit);
activity[tid].long_rq++; activity[tid].long_rq++;
break; break;
} }