From: Aurelien DARRAGON <adarragon@haproxy.com>
Date: Wed, 23 Nov 2022 18:56:35 +0000 (+0100)
Subject: MINOR: mworker: remove unused legacy code in mworker_cleanlisteners
X-Git-Tag: v2.8-dev1~165
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1412d31a6d3146dcc78c294e8faa08bfdde53eed;p=thirdparty%2Fhaproxy.git

MINOR: mworker: remove unused legacy code in mworker_cleanlisteners

This cleanup is a follow up of "CLEANUP: peers: unused code path in
process_peer_sync"

There are some remnants of 1.6 peers specific code in mworker_cleanlisteners()
that was introduced with this patch serie:
f83d3fe00a MEDIUM: init: stop any peers section not bound to the correct process
47c8c029db MEDIUM: init: completely deallocate unused peers

Back then, nbthread did not exist, nbproc was used instead.
Updating some comments to make them more relevant to current haproxy design.
(multithreaded single process)

Moreover, in 47c8c029db, task_free() was performed on peers_fe->task.
But by looking at the code, from 1.6 til now, peers_fe->task
is never used for peers proxies, it is only used for main proxies (referenced
in proxies_list).
Removing this extra task cleanup because it is misleading.
---

diff --git a/src/mworker.c b/src/mworker.c
index 90e96158db..82fa2a2a88 100644
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -460,7 +460,7 @@ void mworker_cleanlisteners()
 	struct proxy *curproxy;
 	struct peers *curpeers;
 
-	/* we might have to unbind some peers sections from some processes */
+	/* peers proxies cleanup */
 	for (curpeers = cfg_peers; curpeers; curpeers = curpeers->next) {
 		if (!curpeers->peers_fe)
 			continue;
@@ -472,11 +472,10 @@ void mworker_cleanlisteners()
 		if (curpeers->sync_task)
 			task_destroy(curpeers->sync_task);
 		curpeers->sync_task = NULL;
-		task_destroy(curpeers->peers_fe->task);
-		curpeers->peers_fe->task = NULL;
 		curpeers->peers_fe = NULL;
 	}
 
+	/* main proxies cleanup */
 	for (curproxy = proxies_list; curproxy; curproxy = curproxy->next) {
 		int listen_in_master = 0;