summaryrefslogtreecommitdiffstats
path: root/src/util/simple_mtx.h
diff options
context:
space:
mode:
authorNicolai Hähnle <[email protected]>2017-10-22 17:38:26 +0200
committerNicolai Hähnle <[email protected]>2017-11-09 11:37:22 +0100
commitb4b2a951c8b4c1315c06cb4d58dbc787949daa4c (patch)
treefedec9d1b58ccccbfbe9a28da85e6ea609afcd21 /src/util/simple_mtx.h
parent688d6958682f96aaeb88aa8cc23cc5c9886a6be4 (diff)
util: move futex helpers into futex.h
v2: style fixes Reviewed-by: Marek Olšák <[email protected]> (v1)
Diffstat (limited to 'src/util/simple_mtx.h')
-rw-r--r--src/util/simple_mtx.h23
1 files changed, 2 insertions, 21 deletions
diff --git a/src/util/simple_mtx.h b/src/util/simple_mtx.h
index 86ba026e61c..9f9e40861f9 100644
--- a/src/util/simple_mtx.h
+++ b/src/util/simple_mtx.h
@@ -24,6 +24,8 @@
#ifndef _SIMPLE_MTX_H
#define _SIMPLE_MTX_H
+#include "util/futex.h"
+
#include "c11/threads.h"
#if defined(__GNUC__) && defined(HAVE_LINUX_FUTEX_H)
@@ -58,27 +60,6 @@ typedef struct {
#define _SIMPLE_MTX_INITIALIZER_NP { 0 }
-#include <stdint.h>
-#include <linux/futex.h>
-#include <sys/time.h>
-#include <sys/syscall.h>
-
-static inline long sys_futex(void *addr1, int op, int val1,
- struct timespec *timeout, void *addr2, int val3)
-{
- return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);
-}
-
-static inline int futex_wake(uint32_t *addr, int count)
-{
- return sys_futex(addr, FUTEX_WAKE, count, NULL, NULL, 0);
-}
-
-static inline int futex_wait(uint32_t *addr, int32_t value)
-{
- return sys_futex(addr, FUTEX_WAIT, value, NULL, NULL, 0);
-}
-
static inline void
simple_mtx_init(simple_mtx_t *mtx, int type)
{