CLEANUP: cpuset: remove the unused proc_t1 field in cpu_map

This field used to store the cpumap of the first thread in a group, and
was used till 2.4 to hold some default settings, after which it was no
longer used. Let's just drop it.

diff --git a/include/haproxy/cpuset-t.h b/include/haproxy/cpuset-t.h
index 3a479e88a5d306f8e2bcbee2a12c5efcc603a336..d3ebb356c713b92d5eda062a10d1312fac9b70ef 100644 (file)
--- a/include/haproxy/cpuset-t.h
+++ b/include/haproxy/cpuset-t.h
@@ -48,7 +48,6 @@ struct hap_cpuset {
 };
 
 struct cpu_map {
-       struct hap_cpuset proc_t1           ;   /* list of CPU masks for the 1st thread of the group */
        struct hap_cpuset thread[MAX_THREADS_PER_GROUP];  /* list of CPU masks for the 32/64 threads of this group */
 };
 

diff --git a/src/haproxy.c b/src/haproxy.c
index 6b8fdf1583aee361782026ad02bf2b42e960be5a..ac6c5034020ac886c3f10cc34f72c5384a0bd211 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1533,7 +1533,6 @@ static void init_early(int argc, char **argv)
                int g, i;
 
                for (g = 0; g < MAX_TGROUPS; g++) {
-                       ha_cpuset_zero(&cpu_map[g].proc_t1);
                        for (i = 0; i < MAX_THREADS_PER_GROUP; ++i) {
                                ha_cpuset_zero(&cpu_map[g].thread[i]);
                        }