Mesa (master): util/anon_file: add OpenBSD shm_mkstemp() path

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Aug 31 09:28:27 UTC 2020


Module: Mesa
Branch: master
Commit: 6e9c0661f8538cdabe7d7de73af11b4165f51f93
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e9c0661f8538cdabe7d7de73af11b4165f51f93

Author: Jonathan Gray <jsg at jsg.id.au>
Date:   Thu Nov  1 13:16:13 2018 +1100

util/anon_file: add OpenBSD shm_mkstemp() path

memfd_create() is a linux syscall replace the use of it with
shm_mkstemp() on OpenBSD.

unconditionally include stdlib.h for mkstemp()/mkostemp()

Fixes: c0376a12341 ("util: add anon_file.h for all memfd/temp file usage")
Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5630>

---

 src/util/anon_file.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/util/anon_file.c b/src/util/anon_file.c
index bd415adb647..6c8885707f4 100644
--- a/src/util/anon_file.c
+++ b/src/util/anon_file.c
@@ -33,16 +33,15 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <stdlib.h>
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <sys/mman.h>
 #elif defined(HAVE_MEMFD_CREATE) || defined(ANDROID)
 #include <sys/syscall.h>
 #include <linux/memfd.h>
-#include <stdlib.h>
 #else
 #include <stdio.h>
-#include <stdlib.h>
 #endif
 
 #if !(defined(__FreeBSD__) || defined(HAVE_MEMFD_CREATE) || defined(HAVE_MKOSTEMP) || defined(ANDROID))
@@ -119,6 +118,11 @@ os_create_anonymous_file(off_t size, const char *debug_name)
 #ifdef __FreeBSD__
    (void*)debug_name;
    fd = shm_open(SHM_ANON, O_CREAT | O_RDWR | O_CLOEXEC, 0600);
+#elif defined(__OpenBSD__)
+   char template[] = "/tmp/mesa-XXXXXXXXXX";
+   fd = shm_mkstemp(template);
+   if (fd != -1)
+      shm_unlink(template);
 #elif defined(HAVE_MEMFD_CREATE) || defined(ANDROID)
    if (!debug_name)
       debug_name = "mesa-shared";



More information about the mesa-commit mailing list