RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: cpuset: fix build on MacOS 

The compilation fails due to the following commit:
fc6ac53dca
BUG/MAJOR: fix build on musl with cpu_set_t support

The new global variable cpu_map conflicted with a local variable of the
same name in the code path for the apple platform when setting the
process affinity.

This does not need to be backported.
This commit is contained in:
Amaury Denoyelle 2021-04-27 16:45:29 +02:00
parent fc6ac53dca
commit 8f685c11e0
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/haproxy.c
View File

@ -3194,13 +3194,13 @@ int main(int argc, char **argv)
ha_cpuset_count(&cpu_map.thread[i])) {/* only do this if the thread has a THREAD map */
#if defined(__APPLE__)
int j;
unsigned long cpu_map = cpu_map.thread[i].cpuset;
unsigned long set = cpu_map.thread[i].cpuset;
while ((j = ffsl(cpu_map)) > 0) {
while ((j = ffsl(set)) > 0) {
thread_affinity_policy_data_t cpu_set = { j - 1 };
thread_port_t mthread = pthread_mach_thread_np(ha_thread_info[i].pthread);
thread_policy_set(mthread, THREAD_AFFINITY_POLICY, (thread_policy_t)&cpu_set, 1);
cpu_map &= ~(1UL << (j - 1));
set &= ~(1UL << (j - 1));
}
#else
struct hap_cpuset *set = &cpu_map.thread[i];