commit a0bdec350f37c9bbf33c713ecc339a9eb956709b
author Christopher Faulet <cfaulet@haproxy.com> Mon Apr 04 07:51:21 2022 +0200
committer Christopher Faulet <cfaulet@haproxy.com> Wed Apr 13 15:10:15 2022 +0200
tree 80262820fbb47d1f4990db5dd685d0f752eb0af6
parent ba92787d132de0de8ed003dd4754ba05a71a681d

MEDIUM: stream-int/conn-stream: Move blocking flags from SI to CS

Remaining flags and associated functions are move in the conn-stream
scope. These flags are added on the endpoint and not the conn-stream
itself. This way it will be possible to get them from the mux or the
applet. The functions to get or set these flags are renamed accordingly with
the "cs_" prefix and updated to manipualte a conn-stream instead of a
stream-interface.

src/stats.c

diff --git a/src/stats.c b/src/stats.c
index 41ce282..22e0d84 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -3209,7 +3209,7 @@
 	}
 
   full:
-	si_rx_room_blk(cs->si);
+	cs_rx_room_blk(cs);
 	return 0;
 }
 
@@ -3700,7 +3700,7 @@
 	return 1;
 
   full:
-	si_rx_room_blk(cs->si);
+	cs_rx_room_blk(cs);
 	return 0;
 }
 
@@ -3803,7 +3803,7 @@
 	}
 
   full:
-	si_rx_room_blk(cs->si);
+	cs_rx_room_blk(cs);
 	return 0;
 
 }
@@ -4196,7 +4196,7 @@
 
   full:
 	htx_reset(htx);
-	si_rx_room_blk(cs->si);
+	cs_rx_room_blk(cs);
 	return 0;
 }
 
@@ -4255,7 +4255,7 @@
 
 full:
 	htx_reset(htx);
-	si_rx_room_blk(cs->si);
+	cs_rx_room_blk(cs);
 	return 0;
 }
 
@@ -4283,7 +4283,7 @@
 
 	/* Check if the input buffer is available. */
 	if (!b_size(&res->buf)) {
-		si_rx_room_blk(cs->si);
+		cs_rx_room_blk(cs);
 		goto out;
 	}
 
@@ -4326,7 +4326,7 @@
 		 */
 		if (htx_is_empty(res_htx)) {
 			if (!htx_add_endof(res_htx, HTX_BLK_EOT)) {
-				si_rx_room_blk(cs->si);
+				cs_rx_room_blk(cs);
 				goto out;
 			}
 			channel_add_input(res, 1);
@@ -4361,7 +4361,7 @@
 	 */
 	htx_to_buf(res_htx, &res->buf);
 	if (!channel_is_empty(res))
-		si_stop_get(cs->si);
+		cs_stop_get(cs);
 }
 
 /* Dump all fields from <info> into <out> using the "show info" format (name: value) */
@@ -4549,7 +4549,7 @@
 		stats_dump_info_fields(&trash, info, appctx->ctx.stats.flags);
 
 	if (ci_putchk(cs_ic(cs), &trash) == -1) {
-		si_rx_room_blk(cs->si);
+		cs_rx_room_blk(cs);
 		return 0;
 	}
 
@@ -4777,7 +4777,7 @@
 	stats_dump_json_schema(&trash);
 
 	if (ci_putchk(cs_ic(cs), &trash) == -1) {
-		si_rx_room_blk(cs->si);
+		cs_rx_room_blk(cs);
 		return 0;
 	}