X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Furcu%2Ffutex.h;h=e96b6e5fc5b2422e3ace466492ce1a73391f3870;hb=d428afc44ee5aa598c8033939ae1c1ac806f1a15;hp=753df622005f8d4103010e9f324827e8f97f2b62;hpb=bb109fb6bc458b93cdc29c2e597efb8331e94ca1;p=userspace-rcu.git

diff --git a/include/urcu/futex.h b/include/urcu/futex.h
index 753df62..e96b6e5 100644
--- a/include/urcu/futex.h
+++ b/include/urcu/futex.h
@@ -24,7 +24,28 @@
  */
 
 #include <urcu/config.h>
+#include <urcu/syscall-compat.h>
+
+#include <errno.h>
 #include <stdint.h>
+#include <time.h>
+
+#if (defined(__linux__) && defined(__NR_futex))
+
+/* For backwards compat */
+#define CONFIG_RCU_HAVE_FUTEX 1
+
+#include <unistd.h>
+#include <errno.h>
+#include <urcu/compiler.h>
+#include <urcu/arch.h>
+
+#elif defined(__FreeBSD__)
+
+#include <sys/types.h>
+#include <sys/umtx.h>
+
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -52,12 +73,7 @@ extern int compat_futex_noasync(int32_t *uaddr, int op, int32_t val,
 extern int compat_futex_async(int32_t *uaddr, int op, int32_t val,
 		const struct timespec *timeout, int32_t *uaddr2, int32_t val3);
 
-#ifdef CONFIG_RCU_HAVE_FUTEX
-
-#include <unistd.h>
-#include <errno.h>
-#include <urcu/compiler.h>
-#include <urcu/arch.h>
+#if (defined(__linux__) && defined(__NR_futex))
 
 static inline int futex(int32_t *uaddr, int op, int32_t val,
 		const struct timespec *timeout, int32_t *uaddr2, int32_t val3)
@@ -102,6 +118,48 @@ static inline int futex_async(int32_t *uaddr, int op, int32_t val,
 	return ret;
 }
 
+#elif defined(__FreeBSD__)
+
+static inline int futex_async(int32_t *uaddr, int op, int32_t val,
+		const struct timespec *timeout,
+		int32_t *uaddr2 __attribute__((unused)),
+		int32_t val3 __attribute__((unused)))
+{
+	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__)
 
 /*