Switch OpenBSD to kqueue mplexer; untested

diff --git a/m4/pdns_check_os.m4 b/m4/pdns_check_os.m4
index da4bc8fd111b7b88ddd37ee76fadd8400e674304..93aa96a7f681e9b35d2b58ae22e04bc7ff918b61 100644 (file)
--- a/m4/pdns_check_os.m4
+++ b/m4/pdns_check_os.m4
@@ -25,6 +25,10 @@ AC_DEFUN([PDNS_CHECK_OS],[
     THREADFLAGS="-pthread"
     have_freebsd="yes"
     ;;
+  openbsd*)
+    THREADFLAGS="-pthread"
+    have_openbsd="yes"
+    ;;
   *)
     LDFLAGS="-pthread $LDFLAGS"
     CXXFLAGS="-pthread $CXXFLAGS"
@@ -32,6 +36,7 @@ AC_DEFUN([PDNS_CHECK_OS],[
   esac
 
   AM_CONDITIONAL([HAVE_FREEBSD], [test "x$have_freebsd" = "xyes"])
+  AM_CONDITIONAL([HAVE_OPENBSD], [test "x$have_openbsd" = "xyes"])
   AM_CONDITIONAL([HAVE_LINUX], [test "x$have_linux" = "xyes"])
   AM_CONDITIONAL([HAVE_SOLARIS], [test "x$have_solaris" = "xyes"])
 

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 7fa3b20418f49f8158e40be3b865275d48b6bfdc..949b144c07f698c64dcbe71bc89f8fa5b09633b2 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1432,6 +1432,11 @@ ixfrdist_SOURCES += kqueuemplexer.cc
 testrunner_SOURCES += kqueuemplexer.cc
 endif
 
+if HAVE_OPENBSD
+ixfrdist_SOURCES += kqueuemplexer.cc
+testrunner_SOURCES += kqueuemplexer.cc
+endif
+
 if HAVE_LINUX
 ixfrdist_SOURCES += epollmplexer.cc
 testrunner_SOURCES += epollmplexer.cc

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 7d2ae2a2ee64454a185bc16c4a297e2edd7f003f..f635d4e6b667eaa84fcec9bdc93fc56383f00c2b 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -374,6 +374,11 @@ dnsdist_SOURCES += kqueuemplexer.cc
 testrunner_SOURCES += kqueuemplexer.cc
 endif
 
+if HAVE_OPENBSD
+dnsdist_SOURCES += kqueuemplexer.cc
+testrunner_SOURCES += kqueuemplexer.cc
+endif
+
 if HAVE_LINUX
 dnsdist_SOURCES += epollmplexer.cc
 testrunner_SOURCES += epollmplexer.cc

diff --git a/pdns/kqueuemplexer.cc b/pdns/kqueuemplexer.cc
index 30094eccb6659320514725896be025e7b1431e3e..cb8a3efb4e7a4e5c7acc700eb90f922f7ec29444 100644 (file)
--- a/pdns/kqueuemplexer.cc
+++ b/pdns/kqueuemplexer.cc
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include "misc.hh"
 #include <sys/types.h>
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
 #include <sys/event.h>
 #endif
 #include <sys/time.h>

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index ecdc4632f4d0e0817796357f672030e1a8f69fbf..f318d554576cf57c80a89ac7216c3dc3ccb3ce35 100644 (file)
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -388,6 +388,11 @@ pdns_recursor_SOURCES += kqueuemplexer.cc
 testrunner_SOURCES += kqueuemplexer.cc
 endif
 
+if HAVE_OPENBSD
+pdns_recursor_SOURCES += kqueuemplexer.cc
+testrunner_SOURCES += kqueuemplexer.cc
+endif
+
 if HAVE_LINUX
 pdns_recursor_SOURCES += epollmplexer.cc
 testrunner_SOURCES += epollmplexer.cc