From: Valentine Krasnobaeva <vkrasnobaeva@haproxy.com>
Date: Mon, 1 Jul 2024 12:10:14 +0000 (+0200)
Subject: REORG: mworker: set nbthread=1 for master after fork
X-Git-Tag: v3.1-dev10~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26e53e2e8c2d3b65d6bca4fabff7cb0d185ae8f4;p=thirdparty%2Fhaproxy.git

REORG: mworker: set nbthread=1 for master after fork

After moving master-worker fork into init() and reintroducing it into a
switch-case (see the previous commit), it is more appropriate to set
nbthread=1 and nbtgroups=1 immediately in the 'case' for the parent process.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 686e16ac3a..3a89a281fa 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2096,15 +2096,6 @@ static void init(int argc, char **argv)
 		LIST_APPEND(&proc_list, &tmproc->list);
 	}
 
-	if (global.mode & MODE_MWORKER_WAIT) {
-		/* in exec mode, there's always exactly one thread. Failure to
-		 * set these ones now will result in nbthread being detected
-		 * automatically.
-		 */
-		global.nbtgroups = 1;
-		global.nbthread = 1;
-	}
-
 	/* if daemon + mworker: must fork here to let a master process live in
 	 * background before forking children.
 	 */
@@ -2204,6 +2195,12 @@ static void init(int argc, char **argv)
 						break;
 				}
 			}
+			/* in exec mode, there's always exactly one thread. Failure to
+			 * set these ones now will result in nbthread being detected
+			 * automatically.
+			 */
+			global.nbtgroups = 1;
+			global.nbthread = 1;
 		}
 	}