diff options
| author | Dmitry Sivachenko <demon@FreeBSD.org> | 2017-08-18 08:05:46 +0000 |
|---|---|---|
| committer | Dmitry Sivachenko <demon@FreeBSD.org> | 2017-08-18 08:05:46 +0000 |
| commit | 76052d5924cd4c2ce83fb73447330b8cb1df3921 (patch) | |
| tree | 3272387f687c63d1112e38af1bf01191a8819241 /net/haproxy/files | |
| parent | * Updated to 6.1.7 (diff) | |
Update to version 1.7.9.
Notes
Notes:
svn path=/head/; revision=448211
Diffstat (limited to 'net/haproxy/files')
| -rw-r--r-- | net/haproxy/files/patch-fix-cpuaffinity | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/net/haproxy/files/patch-fix-cpuaffinity b/net/haproxy/files/patch-fix-cpuaffinity new file mode 100644 index 000000000000..ba992d5f9465 --- /dev/null +++ b/net/haproxy/files/patch-fix-cpuaffinity @@ -0,0 +1,26 @@ +X-Git-Url: http://git.haproxy.org/?p=haproxy.git;a=blobdiff_plain;f=src%2Fhaproxy.c;h=30e850c4ac4719b71adccb3b6bd41248ef5bb470;hp=7af4ab479c761a43b2fa64d2124388dbf5c21fc3;hb=97148f60b8feec39b76768d1bcfab6d755c12164;hpb=0d00593361b91017b894c4c7d5e24721a7838d6e + +diff --git a/src/haproxy.c b/src/haproxy.c +index 7af4ab4..30e850c 100644 +--- src/haproxy.c ++++ src/haproxy.c +@@ -2018,7 +2018,18 @@ int main(int argc, char **argv) + proc < LONGBITS && /* only the first 32/64 processes may be pinned */ + global.cpu_map[proc]) /* only do this if the process has a CPU map */ + #ifdef __FreeBSD__ +- cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(unsigned long), (void *)&global.cpu_map[proc]); ++ { ++ cpuset_t cpuset; ++ int i; ++ unsigned long cpu_map = global.cpu_map[proc]; ++ ++ CPU_ZERO(&cpuset); ++ while ((i = ffsl(cpu_map)) > 0) { ++ CPU_SET(i - 1, &cpuset); ++ cpu_map &= ~(1 << (i - 1)); ++ } ++ ret = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cpuset), &cpuset); ++ } + #else + sched_setaffinity(0, sizeof(unsigned long), (void *)&global.cpu_map[proc]); + #endif |