1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MINOR: cpuset: make the API support negative CPU IDs

Browse Source 
Negative IDs are very convenient to mean "not set", so let's just make
the cpuset API robust against this, especially with ha_cpuset_isset()
so that we don't have to manually add this check everywhere when a
value is not known.
This commit is contained in:
Willy Tarreau 2025-03-12 18:46:25 +01:00
parent f156baf8ce
commit 32bb68e736
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpuset.c
View File

@ -21,7 +21,7 @@ void ha_cpuset_zero(struct hap_cpuset *set)
int ha_cpuset_set(struct hap_cpuset *set, int cpu) int ha_cpuset_set(struct hap_cpuset *set, int cpu)
{ {
if (cpu >= ha_cpuset_size()) if (cpu < 0 || cpu >= ha_cpuset_size())
return 1; return 1;
#if defined(CPUSET_USE_CPUSET) || defined(CPUSET_USE_FREEBSD_CPUSET) #if defined(CPUSET_USE_CPUSET) || defined(CPUSET_USE_FREEBSD_CPUSET)
@ -36,7 +36,7 @@ int ha_cpuset_set(struct hap_cpuset *set, int cpu)
int ha_cpuset_clr(struct hap_cpuset *set, int cpu) int ha_cpuset_clr(struct hap_cpuset *set, int cpu)
{ {
if (cpu >= ha_cpuset_size()) if (cpu < 0 || cpu >= ha_cpuset_size())
return 1; return 1;
#if defined(CPUSET_USE_CPUSET) || defined(CPUSET_USE_FREEBSD_CPUSET) #if defined(CPUSET_USE_CPUSET) || defined(CPUSET_USE_FREEBSD_CPUSET)
@ -77,7 +77,7 @@ void ha_cpuset_or(struct hap_cpuset *dst, struct hap_cpuset *src)
int ha_cpuset_isset(const struct hap_cpuset *set, int cpu) int ha_cpuset_isset(const struct hap_cpuset *set, int cpu)
{ {
if (cpu >= ha_cpuset_size()) if (cpu < 0 || cpu >= ha_cpuset_size())
return 0; return 0;
#if defined(CPUSET_USE_CPUSET) || defined(CPUSET_USE_FREEBSD_CPUSET) #if defined(CPUSET_USE_CPUSET) || defined(CPUSET_USE_FREEBSD_CPUSET)