projects
/
haproxy-2.5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5c110b9
)
BUG/MEDIUM: tasks: Don't insert in the global rqueue if nbthread == 1
author
Olivier Houchard
<ohouchard@haproxy.com>
Thu, 16 Aug 2018 17:03:02 +0000
(19:03 +0200)
committer
Willy Tarreau
<w@1wt.eu>
Thu, 16 Aug 2018 17:25:46 +0000
(19:25 +0200)
Make sure we don't insert a task in the global run queue if nbthread == 1,
as, as an optimisation, we avoid reading from it if nbthread == 1.
src/task.c
patch
|
blob
|
history
diff --git
a/src/task.c
b/src/task.c
index
de097ba
..
e357bc1
100644
(file)
--- a/
src/task.c
+++ b/
src/task.c
@@
-395,7
+395,8
@@
void process_runnable_tasks()
state = HA_ATOMIC_AND(&t->state, ~TASK_RUNNING);
if (state)
#ifdef USE_THREAD
- __task_wakeup(t, (t->thread_mask == tid_bit) ?
+ __task_wakeup(t, (t->thread_mask == tid_bit ||
+ global.nbthread == 1) ?
&rqueue_local[tid] : &rqueue);
#else
__task_wakeup(t, &rqueue_local[tid]);