mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: mux_pt: Only call the wake emthod if nobody subscribed to receive.

Browse Source 
In mux_pt_io_cb(), instead of always calling the wake method, only do so
if nobody subscribed for receive. If we have a subscription, just wake the
associated tasklet up.

This should be backported to 1.9 and 2.0.
This commit is contained in:
Olivier Houchard 2019-10-18 14:18:29 +02:00
parent ea510fc5e7
commit 2ed389dc6e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mux_pt.c
View File

@ -55,13 +55,15 @@ static struct task *mux_pt_io_cb(struct task *t, void *tctx, unsigned short stat
* mux_pt_io_cb() is only supposed to be called if we have no
* stream attached. However, maybe the tasklet got woken up,
* and this connection was then attached to a new stream.
* If this happened, just call the wake method. It is probably
* not needed, because the stream probably subscribed to
* receive events, but that way we'll be sure the event got
* noticed, and if we had any error on the connection, we will
* let the stream call the detach method to destroy it.
* If this happened, just wake the tasklet up if anybody
* subscribed to receive events, and otherwise call the wake
* method, to make sure the event is noticed.
*/
if (ctx->cs->data_cb->wake)
if (ctx->conn->recv_wait) {
ctx->conn->recv_wait->events &= ~SUB_RETRY_RECV;
tasklet_wakeup(ctx->conn->recv_wait->tasklet);
ctx->conn->recv_wait = NULL;
} else if (ctx->cs->data_cb->wake)
ctx->cs->data_cb->wake(ctx->cs);
return NULL;
}