Merge pull request #7244 from devnexen/netbsd_build_fix

NetBSD build update.

src/Makefile

@@ -128,6 +128,14 @@ else
 ifeq ($(uname_S),DragonFly)
 	# FreeBSD
 	FINAL_LIBS+= -lpthread -lexecinfo
+else
+ifeq ($(uname_S),OpenBSD)
+	# OpenBSD
+	FINAL_LIBS+= -lpthread -lexecinfo
+else
+ifeq ($(uname_S),NetBSD)
+	# NetBSD
+	FINAL_LIBS+= -lpthread -lexecinfo
 else
 	# All the other OSes (notably Linux)
 	FINAL_LDFLAGS+= -rdynamic
@@ -138,6 +146,8 @@ endif
 endif
 endif
 endif
+endif
+endif
 # Include paths to dependencies
 FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
 

src/config.h

@@ -248,7 +248,7 @@ int pthread_setname_np(const char *name);
 #endif
 
 /* Check if we can use setcpuaffinity(). */
-#if (defined __linux || defined __NetBSD__ || defined __FreeBSD__ || defined __OpenBSD__)
+#if (defined __linux || defined __NetBSD__ || defined __FreeBSD__)
 #define USE_SETCPUAFFINITY
 void setcpuaffinity(const char *cpulist);
 #endif

src/setcpuaffinity.c

@@ -36,6 +36,10 @@
 #include <sys/param.h>
 #include <sys/cpuset.h>
 #endif
+#ifdef __NetBSD__
+#include <pthread.h>
+#include <sched.h>
+#endif
 #include "config.h"
 
 #ifdef USE_SETCPUAFFINITY
@@ -71,11 +75,18 @@ void setcpuaffinity(const char *cpulist) {
 #ifdef __FreeBSD__
     cpuset_t cpuset;
 #endif
+#ifdef __NetBSD__
+    cpuset_t *cpuset;
+#endif
 
     if (!cpulist)
         return;
 
+#ifndef __NetBSD__
     CPU_ZERO(&cpuset);
+#else
+    cpuset = cpuset_create();
+#endif
 
     q = cpulist;
     while (p = q, q = next_token(q, ','), p) {
@@ -110,7 +121,11 @@ void setcpuaffinity(const char *cpulist) {
             return;
 
         while (a <= b) {
+#ifndef __NetBSD__
             CPU_SET(a, &cpuset);
+#else
+            cpuset_set(a, cpuset);
+#endif
             a += s;
         }
     }
@@ -124,6 +139,10 @@ void setcpuaffinity(const char *cpulist) {
 #ifdef __FreeBSD__
     cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, sizeof(cpuset), &cpuset);
 #endif
+#ifdef __NetBSD__
+    pthread_setaffinity_np(pthread_self(), cpuset_size(cpuset), cpuset);
+    cpuset_destroy(cpuset);
+#endif
 }
 
 #endif /* USE_SETCPUAFFINITY */