RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-18 19:50:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: stream: always call si_cs_recv() after a failed buffer allocation

Browse Source 
If a buffer allocation failed, we have SI_FL_WAIT_ROOM set and c_size(buf)
being zero. It's the only moment where we have a new opportunity to try to
allocate this buffer. However we don't want to waste our time trying this
if both are non-null since it indicates missing room without any changed
condition.
This commit is contained in:
Willy Tarreau 2018-10-25 10:28:27 +02:00
parent 581abd3f99
commit 18e066c2e7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/stream.c
View File

@ -1676,7 +1676,7 @@ struct task *process_stream(struct task *t, void *context, unsigned short state)
co_data(si_oc(si_f)))
si_cs_send(cs);
if (!(si_f->wait_event.wait_reason & SUB_CAN_RECV) &&
!(si_f->flags & SI_FL_WAIT_ROOM))
(!(si_f->flags & SI_FL_WAIT_ROOM) || !c_size(req)))
si_cs_recv(cs);
}
cs = objt_cs(si_b->end);
@ -1685,7 +1685,7 @@ struct task *process_stream(struct task *t, void *context, unsigned short state)
co_data(si_oc(si_b)))
si_cs_send(cs);
if (!(si_b->wait_event.wait_reason & SUB_CAN_RECV) &&
!(si_b->flags & SI_FL_WAIT_ROOM))
(!(si_b->flags & SI_FL_WAIT_ROOM) || !c_size(res)))
si_cs_recv(cs);
}
redo: