X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Furcu%2Ffutex.h;h=f1181ee4a6011022af997b53b375addc93ba9137;hb=8f44fbdc2080c457498a4fd910d70a1ee9f79bb5;hp=b219835e0925b9d5b8e3ad64cc3e288b233fac2c;hpb=e9af364c26b0e474b87a7fe5fb2222a399f8e180;p=userspace-rcu.git

diff --git a/include/urcu/futex.h b/include/urcu/futex.h
index b219835..f1181ee 100644
--- a/include/urcu/futex.h
+++ b/include/urcu/futex.h
@@ -19,22 +19,23 @@
 #if (defined(__linux__) && defined(__NR_futex))
 
 /* For backwards compat */
-#define CONFIG_RCU_HAVE_FUTEX 1
+# define CONFIG_RCU_HAVE_FUTEX 1
 
-#include <unistd.h>
-#include <errno.h>
-#include <urcu/compiler.h>
-#include <urcu/arch.h>
+# include <unistd.h>
+# include <errno.h>
+# include <urcu/compiler.h>
+# include <urcu/arch.h>
+# include <urcu/assert.h>
 
 #elif defined(__FreeBSD__)
 
-#include <sys/types.h>
-#include <sys/umtx.h>
+# include <sys/types.h>
+# include <sys/umtx.h>
 
 #elif defined(__OpenBSD__)
 
-#include <sys/time.h>
-#include <sys/futex.h>
+# include <sys/time.h>
+# include <sys/futex.h>
 
 #endif
 
@@ -43,8 +44,8 @@ extern "C" {
 #endif
 
 #ifndef __OpenBSD__
-#define FUTEX_WAIT		0
-#define FUTEX_WAKE		1
+# define FUTEX_WAIT		0
+# define FUTEX_WAKE		1
 #endif
 
 /*
@@ -71,8 +72,7 @@ extern int compat_futex_async(int32_t *uaddr, int op, int32_t val,
 static inline int futex(int32_t *uaddr, int op, int32_t val,
 		const struct timespec *timeout, int32_t *uaddr2, int32_t val3)
 {
-	return syscall(__NR_futex, uaddr, op, val, timeout,
-			uaddr2, val3);
+	return syscall(__NR_futex, uaddr, op, val, timeout, uaddr2, val3);
 }
 
 static inline int futex_noasync(int32_t *uaddr, int op, int32_t val,
@@ -114,9 +114,7 @@ static inline int futex_async(int32_t *uaddr, int op, int32_t val,
 #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)))
+		const struct timespec *timeout, int32_t *uaddr2, int32_t val3)
 {
 	int umtx_op;
 	void *umtx_uaddr = NULL, *umtx_uaddr2 = NULL;
@@ -125,6 +123,13 @@ static inline int futex_async(int32_t *uaddr, int op, int32_t val,
 		._clockid = CLOCK_MONOTONIC,
 	};
 
+	/*
+	 * Check if NULL or zero. Don't let users expect that they are
+	 * taken into account.
+	 */
+	urcu_posix_assert(!uaddr2);
+	urcu_posix_assert(!val3);
+
 	switch (op) {
 	case FUTEX_WAIT:
 		/* On FreeBSD, a "u_int" is a 32-bit integer. */
@@ -160,6 +165,12 @@ static inline int futex_noasync(int32_t *uaddr, int op, int32_t val,
 {
 	int ret;
 
+	/*
+	 * Check that val3 is zero. Don't let users expect that it is
+	 * taken into account.
+	 */
+	urcu_posix_assert(!val3);
+
 	ret = futex((volatile uint32_t *) uaddr, op, val, timeout,
 		(volatile uint32_t *) uaddr2);
 	if (caa_unlikely(ret < 0 && errno == ENOSYS)) {
@@ -174,6 +185,12 @@ static inline int futex_async(int32_t *uaddr, int op, int32_t val,
 {
 	int ret;
 
+	/*
+	 * Check that val3 is zero. Don't let users expect that it is
+	 * taken into account.
+	 */
+	urcu_posix_assert(!val3);
+
 	ret = futex((volatile uint32_t *) uaddr, op, val, timeout,
 		(volatile uint32_t *) uaddr2);
 	if (caa_unlikely(ret < 0 && errno == ENOSYS)) {