mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-24 08:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use shm_open instead of mkstemp

Browse source 
shm_open is more reliable because it does not require
a writeable filesystem folder, unlike mkstemp.

(cherry picked from commit e2bc8866f4)
This commit is contained in:
Manuel Stoeckl 2022-11-24 17:56:01 -05:00 committed by Simon Ser
parent 68b4ed3a4a
commit 9f4229827f
1 changed files with 29 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
client/pool-buffer.c
View file

@ -1,52 +1,45 @@
#define _POSIX_C_SOURCE 200809 #define _POSIX_C_SOURCE 200809
#include <assert.h> #include <assert.h>
#include <cairo.h> #include <cairo.h>
#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <pango/pangocairo.h> #include <pango/pangocairo.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#include <wayland-client.h> #include <wayland-client.h>
#include "config.h" #include "config.h"
#include "pool-buffer.h" #include "pool-buffer.h"
#include "util.h" #include "util.h"
static int create_pool_file(size_t size, char **name) { static int anonymous_shm_open(void) {
static const char template[] = "sway-client-XXXXXX"; int retries = 100;
const char *path = getenv("XDG_RUNTIME_DIR");
if (path == NULL) {
fprintf(stderr, "XDG_RUNTIME_DIR is not set\n");
return -1;
}
size_t name_size = strlen(template) + 1 + strlen(path) + 1; do {
*name = malloc(name_size); // try a probably-unique name
if (*name == NULL) { struct timespec ts;
fprintf(stderr, "allocation failed\n"); clock_gettime(CLOCK_MONOTONIC, &ts);
return -1; pid_t pid = getpid();
} char name[50];
snprintf(*name, name_size, "%s/%s", path, template); snprintf(name, sizeof(name), "/sway-%x-%x",
(unsigned int)pid, (unsigned int)ts.tv_nsec);
int fd = mkstemp(*name);
if (fd < 0) {
return -1;
}
if (!sway_set_cloexec(fd, true)) {
close(fd);
return -1;
}
if (ftruncate(fd, size) < 0) {
close(fd);
return -1;
}
// shm_open guarantees that O_CLOEXEC is set
int fd = shm_open(name, O_RDWR | O_CREAT | O_EXCL, 0600);
if (fd >= 0) {
shm_unlink(name);
return fd; return fd;
} }
--retries;
} while (retries > 0 && errno == EEXIST);
return -1;
}
static void buffer_release(void *data, struct wl_buffer *wl_buffer) { static void buffer_release(void *data, struct wl_buffer *wl_buffer) {
struct pool_buffer *buffer = data; struct pool_buffer *buffer = data;
buffer->busy = false; buffer->busy = false;
@ -62,17 +55,20 @@ static struct pool_buffer *create_buffer(struct wl_shm *shm,
uint32_t stride = width * 4; uint32_t stride = width * 4;
size_t size = stride * height; size_t size = stride * height;
char *name; int fd = anonymous_shm_open();
int fd = create_pool_file(size, &name); if (fd == -1) {
assert(fd != -1); return NULL;
}
if (ftruncate(fd, size) < 0) {
close(fd);
return NULL;
}
void *data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); void *data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
struct wl_shm_pool *pool = wl_shm_create_pool(shm, fd, size); struct wl_shm_pool *pool = wl_shm_create_pool(shm, fd, size);
buf->buffer = wl_shm_pool_create_buffer(pool, 0, buf->buffer = wl_shm_pool_create_buffer(pool, 0,
width, height, stride, format); width, height, stride, format);
wl_shm_pool_destroy(pool); wl_shm_pool_destroy(pool);
close(fd); close(fd);
unlink(name);
free(name);
buf->size = size; buf->size = size;
buf->width = width; buf->width = width;