From: Alex Xu <alex_y_xu@yahoo.ca>
Date: Tue, 28 Jan 2020 01:17:22 +0000 (-0500)
Subject: Use _umtx_op for futex on FreeBSD
X-Git-Tag: v0.12.0~2
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=3214608619eac09e9c0ab1ea9a1a36bd1b85c18d;p=urcu.git

Use _umtx_op for futex on FreeBSD

Tested with "make check", "make regtest" and a knotd slave.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/urcu/futex.h b/include/urcu/futex.h
index c206c6f..f720cdc 100644
--- a/include/urcu/futex.h
+++ b/include/urcu/futex.h
@@ -24,6 +24,7 @@
  */
 
 #include <urcu/config.h>
+#include <errno.h>
 #include <stdint.h>
 #include <time.h>
 
@@ -103,6 +104,49 @@ static inline int futex_async(int32_t *uaddr, int op, int32_t val,
 	return ret;
 }
 
+#elif defined(__FreeBSD__)
+
+#include <sys/types.h>
+#include <sys/umtx.h>
+
+static inline int futex_async(int32_t *uaddr, int op, int32_t val,
+		const struct timespec *timeout, int32_t *uaddr2, int32_t val3)
+{
+	int umtx_op;
+	void *umtx_uaddr = NULL, *umtx_uaddr2 = NULL;
+	struct _umtx_time umtx_timeout = {
+		._flags = UMTX_ABSTIME,
+		._clockid = CLOCK_MONOTONIC,
+	};
+
+	switch (op) {
+	case FUTEX_WAIT:
+		/* On FreeBSD, a "u_int" is a 32-bit integer. */
+		umtx_op = UMTX_OP_WAIT_UINT;
+		if (timeout != NULL) {
+			umtx_timeout._timeout = *timeout;
+			umtx_uaddr = (void *) sizeof(umtx_timeout);
+			umtx_uaddr2 = (void *) &umtx_timeout;
+		}
+		break;
+	case FUTEX_WAKE:
+		umtx_op = UMTX_OP_WAKE;
+		break;
+	default:
+		errno = EINVAL;
+		return -1;
+	}
+
+	return _umtx_op(uaddr, umtx_op, (uint32_t) val, umtx_uaddr,
+			umtx_uaddr2);
+}
+
+static inline int futex_noasync(int32_t *uaddr, int op, int32_t val,
+		const struct timespec *timeout, int32_t *uaddr2, int32_t val3)
+{
+	return futex_async(uaddr, op, val, timeout, uaddr2, val3);
+}
+
 #elif defined(__CYGWIN__)
 
 /*