From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Alex Xu \(Hello71\) via lttng-dev" Subject: [PATCH v2 2/2] Use _umtx_op for futex on FreeBSD Date: Mon, 27 Jan 2020 15:08:30 -0500 Message-ID: <20200127200830.29347-2-alex_y_xu@yahoo.ca> References: <20200127200830.29347-1-alex_y_xu@yahoo.ca> Reply-To: "Alex Xu \(Hello71\)" Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from sonic309-48.consmr.mail.gq1.yahoo.com (sonic309-48.consmr.mail.gq1.yahoo.com [98.137.65.174]) by lists.lttng.org (Postfix) with ESMTPS id 48618M6dlsz1xYS for ; Mon, 27 Jan 2020 15:10:43 -0500 (EST) In-Reply-To: <20200127200830.29347-1-alex_y_xu@yahoo.ca> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lttng-dev-bounces@lists.lttng.org Sender: "lttng-dev" To: lttng-dev@lists.lttng.org List-Id: lttng-dev@lists.lttng.org --- 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 +#include #include #include @@ -103,6 +104,49 @@ static inline int futex_async(int32_t *uaddr, int op, int32_t val, return ret; } +#elif defined(__FreeBSD__) + +#include + +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