* [PATCH v2 2/2] Use _umtx_op for futex on FreeBSD
2020-01-27 20:08 ` [PATCH v2 1/2] Add FreeBSD, DragonFly to syscall-compat.h Alex Xu (Hello71) via lttng-dev
@ 2020-01-27 20:08 ` Alex Xu (Hello71) via lttng-dev
2020-01-30 18:33 ` [PATCH v2 1/2] Add FreeBSD, DragonFly to syscall-compat.h Mathieu Desnoyers
1 sibling, 0 replies; 3+ messages in thread
From: Alex Xu (Hello71) via lttng-dev @ 2020-01-27 20:08 UTC (permalink / raw)
To: lttng-dev
---
include/urcu/futex.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/include/urcu/futex.h b/include/urcu/futex.h
index c206c6f..5a95d00 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/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, 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__)
/*
--
2.25.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2 1/2] Add FreeBSD, DragonFly to syscall-compat.h
2020-01-27 20:08 ` [PATCH v2 1/2] Add FreeBSD, DragonFly to syscall-compat.h Alex Xu (Hello71) via lttng-dev
2020-01-27 20:08 ` [PATCH v2 2/2] Use _umtx_op for futex on FreeBSD Alex Xu (Hello71) via lttng-dev
@ 2020-01-30 18:33 ` Mathieu Desnoyers
1 sibling, 0 replies; 3+ messages in thread
From: Mathieu Desnoyers @ 2020-01-30 18:33 UTC (permalink / raw)
To: Alex Xu; +Cc: lttng-dev, paulmck
Merged into liburcu master, thanks!
Mathieu
----- On Jan 27, 2020, at 3:08 PM, lttng-dev lttng-dev@lists.lttng.org wrote:
> ---
> include/urcu/syscall-compat.h | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/include/urcu/syscall-compat.h b/include/urcu/syscall-compat.h
> index fa63a7b..23b266e 100644
> --- a/include/urcu/syscall-compat.h
> +++ b/include/urcu/syscall-compat.h
> @@ -32,8 +32,9 @@
> #elif defined(__linux__) || defined(__GLIBC__)
> #include <syscall.h>
>
> -#elif defined(__CYGWIN__) || defined(__APPLE__)
> -/* Don't include anything on Cygwin or MacOSX. */
> +#elif defined(__CYGWIN__) || defined(__APPLE__) || \
> + defined(__FreeBSD__) || defined(__DragonFly__)
> +/* Don't include anything on these platforms. */
>
> #else
> #error "Add platform support to urcu/syscall-compat.h"
> --
> 2.25.0
>
> _______________________________________________
> lttng-dev mailing list
> lttng-dev@lists.lttng.org
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
^ permalink raw reply [flat|nested] 3+ messages in thread