aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-15 18:46:00 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-15 18:46:00 +0000
commitdb830643d21e7c33ec7deb875d45a108290c7100 (patch)
treeb28d7edcd578290e49c7d6bec22a3363179e7d0f
parentwayland: debug: make sure state_str is properly NULL terminated (diff)
shm: prefer posix_fallocate over ftruncate
-rw-r--r--shm.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/shm.c b/shm.c
index 3f3ccf21..33095e74 100644
--- a/shm.c
+++ b/shm.c
@@ -6,6 +6,7 @@
#include <sys/types.h>
#include <sys/mman.h>
#include <linux/memfd.h>
+#include <fcntl.h>
#include <pixman.h>
@@ -123,9 +124,19 @@ shm_get_buffer(struct wl_shm *shm, int width, int height, unsigned long cookie)
size = stride * height;
LOG_DBG("cookie=%lx: allocating new buffer: %zu KB", cookie, size / 1024);
- if (ftruncate(pool_fd, size) == -1) {
- LOG_ERRNO("failed to truncate SHM pool");
- goto err;
+ int err = posix_fallocate(pool_fd, 0, size);
+ if (err != 0) {
+ static bool failure_logged = false;
+
+ if (!failure_logged) {
+ failure_logged = true;
+ LOG_ERRNO_P("failed to fallocate", err);
+ }
+
+ if (ftruncate(pool_fd, size) == -1) {
+ LOG_ERRNO("failed to truncate SHM pool");
+ goto err;
+ }
}
mmapped = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, pool_fd, 0);