From: Willy Tarreau <w@1wt.eu>
Date: Wed, 29 Mar 2023 15:02:17 +0000 (+0200)
Subject: MINOR: listener: use a common thr_idx from the reference listener
X-Git-Tag: v2.8-dev8~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b65749268053bb8a77dcb4ec7c878f81156ac351;p=thirdparty%2Fhaproxy.git

MINOR: listener: use a common thr_idx from the reference listener

Instead of seeing each listener use its own thr_idx, let's use the same
for all those from a shard. It should provide more accurate and smoother
thread allocation.
---

diff --git a/src/listener.c b/src/listener.c
index f97e2d7d15..8e8a1f1327 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -1190,6 +1190,7 @@ void listener_accept(struct listener *l)
 			uint n0, n1, n2, r1, r2, t, t1, t2;
 			const struct tgroup_info *g1, *g2;
 			ulong m1, m2;
+			uint *thr_idx_ptr;
 
 			/* The principle is that we have two running indexes,
 			 * each visiting in turn all threads bound to this
@@ -1215,7 +1216,8 @@ void listener_accept(struct listener *l)
 			/* keep a copy for the final update. thr_idx is composite
 			 * and made of (n2<<16) + n1.
 			 */
-			n0 = l->thr_idx;
+			thr_idx_ptr = l->rx.shard_info ? &((struct listener *)(l->rx.shard_info->ref->owner))->thr_idx : &l->thr_idx;
+			n0 = _HA_ATOMIC_LOAD(thr_idx_ptr);
 			while (1) {
 				int q1, q2;
 
@@ -1392,7 +1394,7 @@ void listener_accept(struct listener *l)
 				n1 += (n2 << 16);
 
 				/* try to update the index */
-				if (likely(_HA_ATOMIC_CAS(&l->thr_idx, &n0, n1)))
+				if (likely(_HA_ATOMIC_CAS(thr_idx_ptr, &n0, n1)))
 					break;
 			} /* end of main while() loop */