From: David CARLIER <devnexen@gmail.com>
Date: Thu, 6 Jan 2022 18:53:50 +0000 (+0000)
Subject: MINOR: cpuset: switch to sched_setaffinity for FreeBSD 14 and above.
X-Git-Tag: v2.6-dev1~163
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df91cbd58;p=thirdparty%2Fhaproxy.git

MINOR: cpuset: switch to sched_setaffinity for FreeBSD 14 and above.

Following up previous update on cpuset-t.h. Ultimately, at some point
 the cpuset_setaffinity code path could be removed.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index ba91d34fe1..cdd1ae8342 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -3233,12 +3233,11 @@ int main(int argc, char **argv)
 #ifdef USE_CPU_AFFINITY
 		if (!in_parent && ha_cpuset_count(&cpu_map.proc)) {   /* only do this if the process has a CPU map */
 
-#ifdef __FreeBSD__
-			struct hap_cpuset *set = &cpu_map.proc;
-			ret = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(set->cpuset), &set->cpuset);
-#elif defined(__linux__) || defined(__DragonFly__)
 			struct hap_cpuset *set = &cpu_map.proc;
+#if defined(CPUSET_USE_CPUSET) || defined(__DragonFly__)
 			sched_setaffinity(0, sizeof(set->cpuset), &set->cpuset);
+#elif defined(__FreeBSD__)
+			ret = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(set->cpuset), &set->cpuset);
 #endif
 		}
 #endif