]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MEDIUM: dynbuf/stream: do not allocate the buffers in the callback
authorWilly Tarreau <w@1wt.eu>
Mon, 29 Apr 2024 06:52:40 +0000 (08:52 +0200)
committerWilly Tarreau <w@1wt.eu>
Fri, 10 May 2024 15:18:13 +0000 (17:18 +0200)
One of the problematic designs with the buffer_wait mechanism is that
the callbacks pre-allocate the buffers and stay in the run queue for
a while, resulting in all of the few buffers being assigned to waiting
tasks instead of being all available to one task that needs them all at
once.

Here we simply stop doing this, the callback clears the waiting flags
and wakes the task up so that it has a chance of still finding some
buffers.

src/stream.c

index a91cbe4a5cb6e55df73a3c62c92d8e20aabd4ea3..693f7942afff03255c7ebb64acda5df86e2f7d93 100644 (file)
@@ -320,14 +320,11 @@ int stream_buf_available(void *arg)
 {
        struct stream *s = arg;
 
-       if (!s->req.buf.size && !sc_ep_have_ff_data(s->scb) && s->scf->flags & SC_FL_NEED_BUFF &&
-           b_alloc(&s->req.buf, DB_CHANNEL))
+       if (!s->req.buf.size && !sc_ep_have_ff_data(s->scb) && s->scf->flags & SC_FL_NEED_BUFF)
                sc_have_buff(s->scf);
-       else if (!s->res.buf.size && !sc_ep_have_ff_data(s->scf) && s->scb->flags & SC_FL_NEED_BUFF &&
-                b_alloc(&s->res.buf, DB_CHANNEL))
+
+       if (!s->res.buf.size && !sc_ep_have_ff_data(s->scf) && s->scb->flags & SC_FL_NEED_BUFF)
                sc_have_buff(s->scb);
-       else
-               return 0;
 
        task_wakeup(s->task, TASK_WOKEN_RES);
        return 1;