mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: applets: Don't use task_in_rq().

Browse Source 
When deciding if we want to wake the task of an applet up, don't give up
if task_in_rq returns 1, as there's a race condition and another thread
may run it. Instead, always attempt to task_wakeup(), at worst the task
is already in the run queue, and nothing will happen.
This commit is contained in:
Olivier Houchard 2019-04-17 19:29:35 +02:00 committed by Olivier Houchard
parent 0c7a4b6371
commit 51205a1958
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/stream_interface.c
View File

@ -1468,9 +1468,8 @@ void si_applet_wake_cb(struct stream_interface *si)
* appctx but in the case the task is not in runqueue we may have to * appctx but in the case the task is not in runqueue we may have to
* wakeup the appctx immediately. * wakeup the appctx immediately.
*/ */
if (!task_in_rq(si_task(si)) && if ((si_rx_endp_ready(si) && !si_rx_blocked(si)) ||
((si_rx_endp_ready(si) && !si_rx_blocked(si)) || (si_tx_endp_ready(si) && !si_tx_blocked(si)))
(si_tx_endp_ready(si) && !si_tx_blocked(si))))
appctx_wakeup(si_appctx(si)); appctx_wakeup(si_appctx(si));
} }