RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-19 20:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: cfgparse: use already known offline CPU information

Browse Source 
No need to reparse cpu/online, let's just rely on the info we learned
previously about offline CPUs.
This commit is contained in:
Willy Tarreau 2023-07-11 19:48:11 +02:00
parent 0aba375027
commit 9c316a528c
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cfgparse.c
View File

@ -2516,10 +2516,9 @@ static int numa_detect_topology()
struct dirent **node_dirlist = NULL;
int node_dirlist_size = 0;
struct hap_cpuset active_cpus, node_cpu_set;
const char *parse_cpu_set_args[2];
char *err = NULL;
int grp, thr;
struct hap_cpuset node_cpu_set;
int maxcpus = 0;
int grp, thr, cpu;
/* node_cpu_set count is used as return value */
ha_cpuset_zero(&node_cpu_set);
@ -2534,20 +2533,6 @@ static int numa_detect_topology()
if (node_dirlist_size <= 1)
goto free_scandir_entries;
/* 2. read and parse the list of currently online cpu */
if (read_line_to_trash("%s/cpu/online", NUMA_DETECT_SYSTEM_SYSFS_PATH)) {
ha_notice("Cannot read online CPUs list, will not try to refine binding\n");
goto free_scandir_entries;
}
parse_cpu_set_args[0] = trash.area;
parse_cpu_set_args[1] = "\0";
if (parse_cpu_set(parse_cpu_set_args, &active_cpus, &err) != 0) {
ha_notice("Cannot read online CPUs list: '%s'. Will not try to refine binding\n", err);
free(err);
goto free_scandir_entries;
}
/* 3. loop through nodes dirs and find the first one with active cpus */
while (node_dirlist_size--) {
const char *node = node_dirlist[node_dirlist_size]->d_name;
@ -2560,7 +2545,9 @@ static int numa_detect_topology()
}
parse_cpumap(trash.area, &node_cpu_set);
ha_cpuset_and(&node_cpu_set, &active_cpus);
for (cpu = 0; cpu < maxcpus; cpu++)
if (ha_cpu_topo[cpu].st & HA_CPU_F_OFFLINE)
ha_cpuset_clr(&node_cpu_set, cpu);
/* 5. set affinity on the first found node with active cpus */
if (!ha_cpuset_count(&node_cpu_set)) {