tree-wide: replace MAYBE_UNUSED with ASSERTED

[mesa.git] / src / util / simple_mtx.h

diff --git a/src/util/simple_mtx.h b/src/util/simple_mtx.h
index 86ba026e61c5c88d17feea586792da03d348d6fa..94ab6fcef1ff469a340a5bb36c4e24c1f41aeaba 100644 (file)
--- 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,29 +60,8 @@ 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)
+simple_mtx_init(simple_mtx_t *mtx, ASSERTED int type)
 {
    assert(type == mtx_plain);
 
@@ -88,7 +69,7 @@ simple_mtx_init(simple_mtx_t *mtx, int type)
 }
 
 static inline void
-simple_mtx_destroy(simple_mtx_t *mtx)
+simple_mtx_destroy(UNUSED simple_mtx_t *mtx)
 {
 }
 
@@ -102,7 +83,7 @@ simple_mtx_lock(simple_mtx_t *mtx)
       if (c != 2)
          c = __sync_lock_test_and_set(&mtx->val, 2);
       while (c != 0) {
-         futex_wait(&mtx->val, 2);
+         futex_wait(&mtx->val, 2, NULL);
          c = __sync_lock_test_and_set(&mtx->val, 2);
       }
    }