Attachment 14653 Details for Bug 14472 – don't use poll on Mac OS X, it can't be used with devices, only files

[patch] don't use poll on Mac OS X, it can't be used with devices, only files

0011-Don-t-use-poll-on-OSX-it-causes-deadlocks-even-on.patch (text/plain), 2.38 KB, created by Benjamin Reed on 2008-02-28 11:33:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Reed

Created: 2008-02-28 11:33:14 UTC

Size: 2.38 KB

patch

obsolete

>From c3d9f2d8731778cad36acea43f1561811a32e34b Mon Sep 17 00:00:00 2001
>From: Benjamin Reed <ranger@Sin.local>
>Date: Tue, 12 Feb 2008 15:06:26 -0600
>Subject: [PATCH] Don't use poll on OSX, it causes deadlocks (even on leopard).
>
>Mac OS X's poll does not let you poll devices, only "regular" filehandles;
>this test is taken from Glib's test for a broken poll.
>---
> configure.in             |   30 +++++++++++++++++++++++++++++-
> dbus/dbus-sysdeps-unix.c |    2 +-
> 2 files changed, 30 insertions(+), 2 deletions(-)
>
>diff --git a/configure.in b/configure.in
>index 8d0b181..a1658fc 100644
>--- a/configure.in
>+++ b/configure.in
>@@ -584,7 +584,35 @@ AC_DEFINE_UNQUOTED(DBUS_HAVE_ATOMIC_INT_COND, [$have_atomic_inc_cond],
> AC_CHECK_LIB(socket,socket)
> AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
> 
>-AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit)
>+AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll)
>+
>+#### Check for broken poll; taken from Glib's configure
>+
>+AC_MSG_CHECKING([for broken poll])
>+AC_RUN_IFELSE([AC_LANG_SOURCE([[
>+    #include <stdlib.h>
>+    #include <fcntl.h>
>+    #include <poll.h>
>+    #ifdef HAVE_SYS_POLL_H
>+    #include <sys/poll.h>
>+    #endif
>+    int main(void) {
>+      struct pollfd fds[1];
>+      int fd;
>+      fd = open("/dev/null", 1);
>+      fds[0].fd = fd;
>+      fds[0].events = POLLIN;
>+      fds[0].revents = 0;
>+      if (poll(fds, 1, 0) < 0 || (fds[0].revents & POLLNVAL) != 0) {
>+            exit(1);  /* Does not work for devices -- fail */
>+      }
>+      exit(0);
>+    }]])],
>+  [broken_poll=no],
>+  [broken_poll=yes
>+   AC_DEFINE(BROKEN_POLL,1,[poll doesn't work on devices])],
>+  [broken_poll="no (cross compiling)"])
>+AC_MSG_RESULT($broken_poll)
> 
> AC_MSG_CHECKING(for dirfd)
> AC_TRY_LINK([
>diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
>index d9a9030..19858dd 100644
>--- a/dbus/dbus-sysdeps-unix.c
>+++ b/dbus/dbus-sysdeps-unix.c
>@@ -1843,7 +1843,7 @@ _dbus_poll (DBusPollFD *fds,
>             int         n_fds,
>             int         timeout_milliseconds)
> {
>-#ifdef HAVE_POLL
>+#if defined(HAVE_POLL) && !defined(BROKEN_POLL)
>   /* This big thing is a constant expression and should get optimized
>    * out of existence. So it's more robust than a configure check at
>    * no cost.
>-- 
>1.5.3.7
>

Actions: View | Splinter Review

Attachments on bug 14472: 14289 | 14416 | 14653

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.