From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 5 May 2023 09:25:19 +0000 (+0200)
Subject: MINOR: stconn: Add a field to specify the room needed by the SC to progress
X-Git-Tag: v2.8-dev10~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9aed1124edffdf314a352b265811da4adfb21394;p=thirdparty%2Fhaproxy.git

MINOR: stconn: Add a field to specify the room needed by the SC to progress

When the SC is blocked because it is waiting for room in the input buffer,
it will be responsible to specify the minimum free space required to
progress. In this commit, we only introduce the field in the stconn
structure that will be used to store this value. It is a signed value with
the following meaning:

  * -1: The SC is waiting for room but not based on the buffer state. It
        will be typically used during splicing when the pipe is full. In
        this case, only a successful send can unblock the SC.

  * >= 0; The minimum free space in the input buffer to unblock the SC. 0 is
          a special value to specify the SC must be unblocked ASAP, by the
          stream, at the end of process_stream() or when output data are
          consumed on the opposite side.
---

diff --git a/include/haproxy/stconn-t.h b/include/haproxy/stconn-t.h
index e2f13f101c..4396b02cdf 100644
--- a/include/haproxy/stconn-t.h
+++ b/include/haproxy/stconn-t.h
@@ -284,6 +284,10 @@ struct stconn {
 
 	unsigned int flags;                  /* SC_FL_* */
 	unsigned int ioto;                   /* I/O activity timeout */
+	ssize_t room_needed;                 /* free space in the input buffer required to receive more data.
+					      *    -1   : the SC is waiting for room but not on a specific amount of data
+					      *    >= 0 : min free space required to progress. 0 means SC must be unblocked ASAP
+					      */
 	struct wait_event wait_event;        /* We're in a wait list */
 	struct sedesc *sedesc;               /* points to the stream endpoint descriptor */
 	enum obj_type *app;                  /* points to the applicative point (stream or check) */
diff --git a/src/stconn.c b/src/stconn.c
index 8458331895..cb3d750a8a 100644
--- a/src/stconn.c
+++ b/src/stconn.c
@@ -136,6 +136,7 @@ static struct stconn *sc_new(struct sedesc *sedesc)
 	sc->flags = SC_FL_NONE;
 	sc->state = SC_ST_INI;
 	sc->ioto = TICK_ETERNITY;
+	sc->room_needed = 0;
 	sc->app = NULL;
 	sc->app_ops = NULL;
 	sc->src = NULL;