[gtk+/gtk-3-20] wayland: fall back to shm_open if memfd unavailable
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-20] wayland: fall back to shm_open if memfd unavailable
- Date: Thu, 4 Aug 2016 15:39:18 +0000 (UTC)
commit 0969dc59ef320ce0b25e6d7dd6875f12541418a6
Author: Ray Strode <rstrode redhat com>
Date: Thu May 12 15:52:12 2016 -0400
wayland: fall back to shm_open if memfd unavailable
Debian stable currently ships with a 3.16 kernel, so
it doesn't have memfd available.
This commit adds shm_open fall back code for that case
(for now).
https://bugzilla.gnome.org/show_bug.cgi?id=766341
configure.ac | 3 ++
gdk/wayland/gdkdisplay-wayland.c | 41 +++++++++++++++++++++++++++++++++++--
2 files changed, 41 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 194ced1..279eaa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -794,6 +794,9 @@ LIBS="$LIBS $GLIB_LIBS"
AC_CHECK_FUNCS(bind_textdomain_codeset)
LIBS=$gtk_save_LIBS
+AC_CHECK_HEADERS(linux/memfd.h,
+ AC_DEFINE(HAVE_LINUX_MEMFD_H, 1,
+ [Define to 1 if memfd.h is available]))
AC_CHECK_HEADERS(sys/mman.h,
AC_DEFINE(HAVE_SYS_MMAN_H, 1,
[Define to 1 if mman.h is available]))
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 2824d9e..4eb086d 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -22,7 +22,11 @@
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
+
+#ifdef HAVE_LINUX_MEMFD_H
#include <linux/memfd.h>
+#endif
+
#include <sys/mman.h>
#include <sys/syscall.h>
@@ -954,16 +958,47 @@ typedef struct _GdkWaylandCairoSurfaceData {
static int
open_shared_memory (void)
{
- int ret;
+ static gboolean force_shm_open = FALSE;
+ int ret = -1;
+
+#if !defined (__NR_memfd_create)
+ force_shm_open = TRUE;
+#endif
do
{
- ret = syscall (__NR_memfd_create, "gdk-wayland", MFD_CLOEXEC);
+#if defined (__NR_memfd_create)
+ if (!force_shm_open)
+ {
+ ret = syscall (__NR_memfd_create, "gdk-wayland", MFD_CLOEXEC);
+
+ /* fall back to shm_open until debian stops shipping 3.16 kernel
+ * See bug 766341
+ */
+ if (ret < 0 && errno == ENOSYS)
+ force_shm_open = TRUE;
+ }
+#endif
+
+ if (force_shm_open)
+ {
+ char name[NAME_MAX - 1] = "";
+
+ sprintf (name, "/gdk-wayland-%x", g_random_int ());
+
+ ret = shm_open (name, O_CREAT | O_EXCL | O_RDWR | O_CLOEXEC, 0600);
+
+ if (ret >= 0)
+ shm_unlink (name);
+ else if (errno == EEXIST)
+ continue;
+ }
}
while (ret < 0 && errno == EINTR);
if (ret < 0)
- g_critical (G_STRLOC ": creating shared memory file failed: %m");
+ g_critical (G_STRLOC ": creating shared memory file (using %s) failed: %m",
+ force_shm_open? "shm_open" : "memfd_create");
return ret;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]