X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=compat_futex.c;h=bb928e61d6849fc90f63ab5b07fcf82718f28990;hp=27fc66bb4ff7e1318f6bde0788498505319ff02e;hb=2dbf31c9e6479b126f67a3494a9b4dfaa57b39b3;hpb=49617de1d80d771ac9a1d45b1710b16fac65e0aa

diff --git a/compat_futex.c b/compat_futex.c
index 27fc66b..bb928e6 100644
--- a/compat_futex.c
+++ b/compat_futex.c
@@ -3,7 +3,7 @@
  *
  * Userspace RCU library - sys_futex compatibility code
  *
- * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright (c) 2009 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,9 +26,10 @@
 #include <assert.h>
 #include <errno.h>
 #include <poll.h>
+#include <stdint.h>
 
 #include <urcu/arch.h>
-#include <urcu/urcu-futex.h>
+#include <urcu/futex.h>
 
 static pthread_mutex_t compat_futex_lock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t compat_futex_cond = PTHREAD_COND_INITIALIZER;
@@ -39,10 +40,10 @@ static pthread_cond_t compat_futex_cond = PTHREAD_COND_INITIALIZER;
  * Waiter will relinquish the CPU until woken up.
  */
 
-int compat_futex_noasync(int *uaddr, int op, int val,
-	const struct timespec *timeout, int *uaddr2, int val3)
+int compat_futex_noasync(int32_t *uaddr, int op, int32_t val,
+	const struct timespec *timeout, int32_t *uaddr2, int32_t val3)
 {
-	int ret, i, gret = 0;
+	int ret, gret = 0;
 
 	/*
 	 * Check if NULL. Don't let users expect that they are taken into
@@ -55,7 +56,7 @@ int compat_futex_noasync(int *uaddr, int op, int val,
 	/*
 	 * memory barriers to serialize with the previous uaddr modification.
 	 */
-	smp_mb();
+	cmm_smp_mb();
 
 	ret = pthread_mutex_lock(&compat_futex_lock);
 	assert(!ret);
@@ -66,8 +67,7 @@ int compat_futex_noasync(int *uaddr, int op, int val,
 		pthread_cond_wait(&compat_futex_cond, &compat_futex_lock);
 		break;
 	case FUTEX_WAKE:
-		for (i = 0; i < val; i++)
-			pthread_cond_signal(&compat_futex_cond);
+		pthread_cond_broadcast(&compat_futex_cond);
 		break;
 	default:
 		gret = -EINVAL;
@@ -84,11 +84,9 @@ end:
  * Waiter will busy-loop trying to read the condition.
  */
 
-int compat_futex_async(int *uaddr, int op, int val,
-	const struct timespec *timeout, int *uaddr2, int val3)
+int compat_futex_async(int32_t *uaddr, int op, int32_t val,
+	const struct timespec *timeout, int32_t *uaddr2, int32_t val3)
 {
-	int ret, i;
-
 	/*
 	 * Check if NULL. Don't let users expect that they are taken into
 	 * account. 
@@ -100,7 +98,7 @@ int compat_futex_async(int *uaddr, int op, int val,
 	/*
 	 * Ensure previous memory operations on uaddr have completed.
 	 */
-	smp_mb();
+	cmm_smp_mb();
 
 	switch (op) {
 	case FUTEX_WAIT:
@@ -112,4 +110,5 @@ int compat_futex_async(int *uaddr, int op, int val,
 	default:
 		return -EINVAL;
 	}
+	return 0;
 }