*
* 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
#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;
* 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;
/*
* memory barriers to serialize with the previous uaddr modification.
*/
- smp_mb();
+ cmm_smp_mb();
ret = pthread_mutex_lock(&compat_futex_lock);
assert(!ret);
* 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.
/*
* Ensure previous memory operations on uaddr have completed.
*/
- smp_mb();
+ cmm_smp_mb();
switch (op) {
case FUTEX_WAIT:
default:
return -EINVAL;
}
+ return 0;
}