KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wayland: use SHM_ANON on FreeBSD

Browse Source 
Upstream: 36ce73bbfd
This commit is contained in:
Kovid Goyal 2019-02-17 10:30:02 +05:30
parent 869152750c
commit 85faad5ec7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glfw/wl_window.c vendored
View File

@ -140,9 +140,9 @@ static const struct wl_shell_surface_listener shellSurfaceListener = {
static int static int
createAnonymousFile(off_t size) createAnonymousFile(off_t size)
{ {
int ret; int ret, fd = -1, shm_anon = 0;
#ifdef HAS_MEMFD_CREATE #ifdef HAS_MEMFD_CREATE
int fd = memfd_create("glfw-shared", MFD_CLOEXEC | MFD_ALLOW_SEALING); fd = memfd_create("glfw-shared", MFD_CLOEXEC | MFD_ALLOW_SEALING);
if (fd < 0) return -1; if (fd < 0) return -1;
// We can add this seal before calling posix_fallocate(), as the file // We can add this seal before calling posix_fallocate(), as the file
// is currently zero-sized anyway. // is currently zero-sized anyway.
@ -150,11 +150,14 @@ createAnonymousFile(off_t size)
// There is also no need to check for the return value, we couldn’t do // There is also no need to check for the return value, we couldn’t do
// anything with it anyway. // anything with it anyway.
fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_SEAL); fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_SEAL);
#elif defined(SHM_ANON)
fd = shm_open(SHM_ANON, O_RDWR | O_CLOEXEC, 0600);
if (fd < 0) return -1;
shm_anon = 1;
#else #else
static const char template[] = "/glfw-shared-XXXXXX"; static const char template[] = "/glfw-shared-XXXXXX";
const char* path; const char* path;
char* name; char* name;
int fd;
path = getenv("XDG_RUNTIME_DIR"); path = getenv("XDG_RUNTIME_DIR");
if (!path) if (!path)
@ -174,7 +177,8 @@ createAnonymousFile(off_t size)
if (fd < 0) if (fd < 0)
return -1; return -1;
#endif #endif
ret = posix_fallocate(fd, 0, size); // posix_fallocate does not work on SHM descriptors
ret = shm_anon ? ftruncate(fd, size) : posix_fallocate(fd, 0, size);
if (ret != 0) if (ret != 0)
{ {
close(fd); close(fd);