diff options
| author | David Lamparter <equinox@diac24.net> | 2017-05-31 20:47:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-31 20:47:30 +0200 |
| commit | a1e61a923faa5c41ea7e07552f85879f22809e4b (patch) | |
| tree | 8605acc808c9d31759ca91ecdef90fded67a839b | |
| parent | a772d6eae61ccb090de8dda5df43e2770879baa0 (diff) | |
| parent | 16764760f7ad0af3cfda4fe497a8b158242ee4f7 (diff) | |
Merge pull request #645 from qlyoung/nonblocking-fixup
poll() fixup
| -rwxr-xr-x | configure.ac | 6 | ||||
| -rw-r--r-- | lib/thread.c | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index c8b0a78bc6..5e4cfce16d 100755 --- a/configure.ac +++ b/configure.ac @@ -312,8 +312,6 @@ AC_ARG_ENABLE(fpm, AS_HELP_STRING([--enable-fpm], [enable Forwarding Plane Manager support])) AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd], [enable Systemd support])) -AC_ARG_ENABLE(poll, - AS_HELP_STRING([--enable-poll], [enable usage of Poll instead of select])) AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror], [enable -Werror (recommended for developers only)])) AC_ARG_ENABLE(cumulus, @@ -364,10 +362,6 @@ if test "${enable_rr_semantics}" != "no" ; then AC_DEFINE(HAVE_V6_RR_SEMANTICS,, Compile in v6 Route Replacement Semantics) fi -if test "${enable_poll}" = "yes" ; then - AC_DEFINE(HAVE_POLL_CALL,,Compile systemd support in) -fi - dnl ---------- dnl MPLS check dnl ---------- diff --git a/lib/thread.c b/lib/thread.c index 0188ae6c0b..848e39e1ae 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -387,6 +387,7 @@ thread_master_create (void) rv->owner = pthread_self(); pipe (rv->io_pipe); set_nonblocking (rv->io_pipe[0]); + set_nonblocking (rv->io_pipe[1]); rv->handler.pfdsize = rv->fd_limit; rv->handler.pfdcount = 0; |