Attachment 42906 Details for Bug 33337 – [7] Use epoll in a backwards-compatible way on Linux < 2.6.27

[patch] [7] Use epoll in a backwards-compatible way on Linux < 2.6.27

0002-Use-epoll-in-a-backwards-compatible-way-on-Linux-2.6.patch (text/plain), 2.29 KB, created by Simon McVittie on 2011-02-03 10:34:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-02-03 10:34:35 UTC

Size: 2.29 KB

patch

obsolete

>From 85a92d499779d6f9974c94272fd3cee7d7e9aa9d Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 3 Feb 2011 17:18:09 +0000
>Subject: [PATCH 2/2] Use epoll in a backwards-compatible way on Linux < 2.6.27
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33337
>Bug-NB: NB#225019
>---
> configure.in                 |    3 +++
> dbus/dbus-socket-set-epoll.c |   21 ++++++++++++++++++++-
> 2 files changed, 23 insertions(+), 1 deletions(-)
>
>diff --git a/configure.in b/configure.in
>index cdcc4e2..c78bb12 100644
>--- a/configure.in
>+++ b/configure.in
>@@ -911,6 +911,9 @@ fi
> 
> AM_CONDITIONAL(DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX, test x$have_dnotify = xyes)
> 
>+# For simplicity, we require the userland API for epoll_create1 at
>+# compile-time (glibc 2.9), but we'll run on kernels that turn out
>+# not to have it at runtime.
> AC_ARG_ENABLE([epoll],
>               [AS_HELP_STRING([--enable-epoll],[use epoll(4) on Linux])],
>               [enable_epoll=$enableval], [enable_epoll=auto])
>diff --git a/dbus/dbus-socket-set-epoll.c b/dbus/dbus-socket-set-epoll.c
>index b5c3209..08e3765 100644
>--- a/dbus/dbus-socket-set-epoll.c
>+++ b/dbus/dbus-socket-set-epoll.c
>@@ -33,6 +33,7 @@
> #endif
> 
> #include <errno.h>
>+#include <fcntl.h>
> #include <sys/epoll.h>
> #include <unistd.h>
> 
>@@ -81,6 +82,21 @@ _dbus_socket_set_epoll_new (void)
> 
>   if (self->epfd == -1)
>     {
>+      int flags;
>+
>+      /* the size hint is ignored unless you have a rather old kernel,
>+       * but must be positive on some versions, so just pick something
>+       * arbitrary; it's a hint, not a limit */
>+      self->epfd = epoll_create (42);
>+
>+      flags = fcntl (self->epfd, F_GETFD, 0);
>+
>+      if (flags != -1)
>+        fcntl (self->epfd, F_SETFD, flags | FD_CLOEXEC);
>+    }
>+
>+  if (self->epfd == -1)
>+    {
>       socket_set_epoll_free ((DBusSocketSet *) self);
>       return NULL;
>     }
>@@ -252,8 +268,11 @@ socket_set_epoll_remove (DBusSocketSet  *set,
> {
>   DBusSocketSetEpoll *self = socket_set_epoll_cast (set);
>   int err;
>+  /* Kernels < 2.6.9 require a non-NULL struct pointer, even though its
>+   * contents are ignored */
>+  struct epoll_event dummy = { 0 };
> 
>-  if (epoll_ctl (self->epfd, EPOLL_CTL_DEL, fd, NULL) == 0)
>+  if (epoll_ctl (self->epfd, EPOLL_CTL_DEL, fd, &dummy) == 0)
>     return;
> 
>   err = errno;
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 33337: 42531 | 42532 | 42533 | 42534 | 42535 | 42905 | 42906 | 45390 | 47907 | 47908 | 47909 | 47910 | 47911 | 47912 | 53061

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.