Compare commits

...

2 Commits

Author SHA1 Message Date
Ting-Wei Lan
5d897a9b86 tests/wayland: Don't test file sealing on the fallback case
When memfd_create isn't used, the file isn't sealed. Therefore, we
should skip test_readonly_seals on the fallback case. This fixes
compilation error on FreeBSD 12, which does not support memfd_create.
2020-05-03 23:35:38 +08:00
Ting-Wei Lan
819eeeb591 xwayland: Don't use abstract socket on non-Linux systems
Abstract socket is a Linux-only feature. On operating systems other than
Linux, we can only use the normal UNIX socket.

This patch allows mutter to run as a nested Wayland compositor under
Xorg on FreeBSD.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/954
2020-05-03 20:30:21 +08:00
3 changed files with 33 additions and 7 deletions

View File

@@ -27,7 +27,9 @@
#include "wayland-test-client-utils.h"
#if defined(HAVE_MEMFD_CREATE)
#define READONLY_SEALS (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE)
#endif
static const char *teststring = "test string 1234567890";
@@ -67,6 +69,7 @@ test_write_fd (int fd,
return TRUE;
}
#if defined(HAVE_MEMFD_CREATE)
static int
test_readonly_seals (int fd)
{
@@ -81,6 +84,7 @@ test_readonly_seals (int fd)
return TRUE;
}
#endif
static int
test_write_read (int fd)
@@ -224,9 +228,6 @@ main (int argc,
other_fd = meta_anonymous_file_open_fd (file, META_ANONYMOUS_FILE_MAPMODE_PRIVATE);
g_assert (other_fd != -1);
if (test_readonly_seals (fd))
goto fail;
/* Writing and reading the written data should succeed */
if (!test_write_read (fd))
goto fail;
@@ -244,9 +245,6 @@ main (int argc,
other_fd = meta_anonymous_file_open_fd (file, META_ANONYMOUS_FILE_MAPMODE_SHARED);
g_assert (other_fd != -1);
if (test_readonly_seals (fd))
goto fail;
if (!test_read_fd_mmap (fd, teststring))
goto fail;

View File

@@ -46,7 +46,9 @@ typedef struct
{
int display_index;
char *lock_file;
#ifdef __linux__
int abstract_fd;
#endif
int unix_fd;
char *name;
} MetaXWaylandConnection;

View File

@@ -235,6 +235,7 @@ create_lock_file (int display, int *display_out)
return filename;
}
#ifdef __linux__
static int
bind_to_abstract_socket (int display,
gboolean *fatal)
@@ -274,6 +275,7 @@ bind_to_abstract_socket (int display,
return fd;
}
#endif
static int
bind_to_unix_socket (int display)
@@ -385,22 +387,31 @@ open_display_sockets (MetaXWaylandManager *manager,
int *unix_fd_out,
gboolean *fatal)
{
int abstract_fd, unix_fd;
#ifdef __linux__
int abstract_fd;
#endif
int unix_fd;
#ifdef __linux__
abstract_fd = bind_to_abstract_socket (display_index,
fatal);
if (abstract_fd < 0)
return FALSE;
#endif
unix_fd = bind_to_unix_socket (display_index);
if (unix_fd < 0)
{
*fatal = FALSE;
#ifdef __linux__
close (abstract_fd);
#endif
return FALSE;
}
#ifdef __linux__
*abstract_fd_out = abstract_fd;
#endif
*unix_fd_out = unix_fd;
return TRUE;
@@ -617,10 +628,15 @@ meta_xwayland_start_xserver (MetaXWaylandManager *manager,
launcher = g_subprocess_launcher_new (flags);
g_subprocess_launcher_take_fd (launcher, xwayland_client_fd[1], 3);
#ifdef __linux__
g_subprocess_launcher_take_fd (launcher, manager->public_connection.abstract_fd, 4);
g_subprocess_launcher_take_fd (launcher, manager->public_connection.unix_fd, 5);
g_subprocess_launcher_take_fd (launcher, displayfd[1], 6);
g_subprocess_launcher_take_fd (launcher, manager->private_connection.abstract_fd, 7);
#else
g_subprocess_launcher_take_fd (launcher, manager->public_connection.unix_fd, 4);
g_subprocess_launcher_take_fd (launcher, displayfd[1], 5);
#endif
g_subprocess_launcher_setenv (launcher, "WAYLAND_SOCKET", "3", TRUE);
@@ -632,6 +648,7 @@ meta_xwayland_start_xserver (MetaXWaylandManager *manager,
"-accessx",
"-core",
"-auth", manager->auth_file,
#ifdef __linux__
"-listen", "4",
"-listen", "5",
"-displayfd", "6",
@@ -640,6 +657,10 @@ meta_xwayland_start_xserver (MetaXWaylandManager *manager,
#else
"-listen", "7",
#endif
#else /* __linux__ */
"-listen", "4",
"-displayfd", "5",
#endif /* __linux__ */
NULL);
if (!manager->proc)
@@ -774,8 +795,13 @@ meta_xwayland_init (MetaXWaylandManager *manager,
if (policy == META_DISPLAY_POLICY_ON_DEMAND)
{
#ifdef __linux__
g_unix_fd_add (manager->public_connection.abstract_fd, G_IO_IN,
xdisplay_connection_activity_cb, manager);
#else
g_unix_fd_add (manager->public_connection.unix_fd, G_IO_IN,
xdisplay_connection_activity_cb, manager);
#endif
}
return TRUE;