summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2012-04-15 07:06:42 +0200
committerMartin Sustrik <sustrik@250bpm.com>2012-04-16 06:10:18 +0200
commitcb89ca70646591a6cb29e81be43c442d6b5d653b (patch)
tree65b9e0da3a6e9d2ccdb04678bf5edf09fa7176d0
parent34ab0736ebf90068ef4856793f16a9030d3e0197 (diff)
Honour --with-poller option for synchronous polling
While --with-poller configure option could be used for selecting the polling mechanism for I/O threads (asynchronous), synchronous polling (xs_poll, signaler_t) was not affected by the option. This patch uses selected mechanism is it is either 'select' or 'poll'. Othrwise it chooses the mechanism according to the platform. Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
-rw-r--r--src/signaler.cpp4
-rw-r--r--src/upoll.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/signaler.cpp b/src/signaler.cpp
index af905a3..8832c6b 100644
--- a/src/signaler.cpp
+++ b/src/signaler.cpp
@@ -20,9 +20,9 @@
#include "platform.hpp"
-#if defined XS_FORCE_SELECT
+#if defined XS_HAVE_SELECT
#define XS_SIGNALER_WAIT_BASED_ON_SELECT
-#elif defined XS_FORCE_POLL
+#elif defined XS_HAVE_POLL
#define XS_SIGNALER_WAIT_BASED_ON_POLL
#elif defined XS_HAVE_LINUX || defined XS_HAVE_FREEBSD ||\
defined XS_HAVE_OPENBSD || defined XS_HAVE_SOLARIS ||\
diff --git a/src/upoll.cpp b/src/upoll.cpp
index 9dd13ea..d99deec 100644
--- a/src/upoll.cpp
+++ b/src/upoll.cpp
@@ -27,9 +27,9 @@
#include "likely.hpp"
#include "platform.hpp"
-#if defined XS_FORCE_SELECT
+#if defined XS_HAVE_SELECT
#define XS_POLL_BASED_ON_SELECT
-#elif defined XS_FORCE_POLL
+#elif defined XS_HAVE_POLL
#define XS_POLL_BASED_ON_POLL
#elif defined XS_HAVE_LINUX || defined XS_HAVE_FREEBSD ||\
defined XS_HAVE_OPENBSD || defined XS_HAVE_SOLARIS ||\