From: Brad Smith <brad@comstyle.com>
Date: Sat, 18 May 2024 04:34:06 +0000 (-0400)
Subject: Use futex on OpenBSD
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=e9af364c26b0e474b87a7fe5fb2222a399f8e180;p=userspace-rcu.git

Use futex on OpenBSD

Tested with "make check", "make regtest".

Signed-off-by: Brad Smith <brad@comstyle.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: Icd334cda928f998a2cf455839d428ebbb4460f5e
---

diff --git a/include/urcu/futex.h b/include/urcu/futex.h
index 9d0a997..b219835 100644
--- a/include/urcu/futex.h
+++ b/include/urcu/futex.h
@@ -31,14 +31,21 @@
 #include <sys/types.h>
 #include <sys/umtx.h>
 
+#elif defined(__OpenBSD__)
+
+#include <sys/time.h>
+#include <sys/futex.h>
+
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#ifndef __OpenBSD__
 #define FUTEX_WAIT		0
 #define FUTEX_WAKE		1
+#endif
 
 /*
  * sys_futex compatibility header.
@@ -146,6 +153,36 @@ static inline int futex_noasync(int32_t *uaddr, int op, int32_t val,
 	return futex_async(uaddr, op, val, timeout, uaddr2, val3);
 }
 
+#elif defined(__OpenBSD__)
+
+static inline int futex_noasync(int32_t *uaddr, int op, int32_t val,
+		const struct timespec *timeout, int32_t *uaddr2, int32_t val3)
+{
+	int ret;
+
+	ret = futex((volatile uint32_t *) uaddr, op, val, timeout,
+		(volatile uint32_t *) uaddr2);
+	if (caa_unlikely(ret < 0 && errno == ENOSYS)) {
+		return compat_futex_noasync(uaddr, op, val, timeout,
+				uaddr2, val3);
+	}
+	return ret;
+}
+
+static inline int futex_async(int32_t *uaddr, int op, int32_t val,
+		const struct timespec *timeout, int32_t *uaddr2, int32_t val3)
+{
+	int ret;
+
+	ret = futex((volatile uint32_t *) uaddr, op, val, timeout,
+		(volatile uint32_t *) uaddr2);
+	if (caa_unlikely(ret < 0 && errno == ENOSYS)) {
+		return compat_futex_async(uaddr, op, val, timeout,
+				uaddr2, val3);
+	}
+	return ret;
+}
+
 #elif defined(__CYGWIN__)
 
 /*