RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-07 03:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: cfgparse: use read_line_from_trash() to read from /sys

Browse Source 
It's easier to use this function now to natively support variable
fields in the file's path. This also removes read_file_from_trash()
that was only used here and was static.
This commit is contained in:
Willy Tarreau 2023-07-11 15:12:18 +02:00
parent 3c3261c676
commit c11d09ac81
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cfgparse.c
View File

@ -2587,25 +2587,6 @@ static void parse_cpumap(char *cpumap_str, struct hap_cpuset *cpu_set)
} while (comma); } while (comma);
} }
/* Read the first line of a file from <path> into the trash buffer.
* Returns 0 on success, otherwise non-zero.
*/
static int read_file_to_trash(const char *path)
{
FILE *file;
int ret = 1;
file = fopen(path, "r");
if (file) {
if (fgets(trash.area, trash.size, file))
ret = 0;
fclose(file);
}
return ret;
}
/* Inspect the cpu topology of the machine on startup. If a multi-socket /* Inspect the cpu topology of the machine on startup. If a multi-socket
* machine is detected, try to bind on the first node with active cpu. This is * machine is detected, try to bind on the first node with active cpu. This is
* done to prevent an impact on the overall performance when the topology of * done to prevent an impact on the overall performance when the topology of
@ -2625,7 +2606,6 @@ static int numa_detect_topology()
struct hap_cpuset active_cpus, node_cpu_set; struct hap_cpuset active_cpus, node_cpu_set;
const char *parse_cpu_set_args[2]; const char *parse_cpu_set_args[2];
char cpumap_path[PATH_MAX];
char *err = NULL; char *err = NULL;
int grp, thr; int grp, thr;
@ -2639,7 +2619,7 @@ static int numa_detect_topology()
goto free_scandir_entries; goto free_scandir_entries;
/* 2. read and parse the list of currently online cpu */ /* 2. read and parse the list of currently online cpu */
if (read_file_to_trash(NUMA_DETECT_SYSTEM_SYSFS_PATH"/cpu/online")) { 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"); ha_notice("Cannot read online CPUs list, will not try to refine binding\n");
goto free_scandir_entries; goto free_scandir_entries;
} }
@ -2657,10 +2637,7 @@ static int numa_detect_topology()
const char *node = node_dirlist[node_dirlist_size]->d_name; const char *node = node_dirlist[node_dirlist_size]->d_name;
ha_cpuset_zero(&node_cpu_set); ha_cpuset_zero(&node_cpu_set);
snprintf(cpumap_path, PATH_MAX, "%s/node/%s/cpumap", if (read_line_to_trash("%s/node/%s/cpumap", NUMA_DETECT_SYSTEM_SYSFS_PATH, node)) {
NUMA_DETECT_SYSTEM_SYSFS_PATH, node);
if (read_file_to_trash(cpumap_path)) {
ha_notice("Cannot read CPUs list of '%s', will not select them to refine binding\n", node); ha_notice("Cannot read CPUs list of '%s', will not select them to refine binding\n", node);
free(node_dirlist[node_dirlist_size]); free(node_dirlist[node_dirlist_size]);
continue; continue;