util: move futex helpers into futex.h

v2: style fixes

Reviewed-by: Marek Olšák <marek.olsak@amd.com> (v1)

4 files changed, 56 insertions, 19 deletions

diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index c7f6516a99..407b282562 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -13,6 +13,7 @@ MESA_UTIL_FILES := \
 	format_r11g11b10f.h \
 	format_rgb9e5.h \
 	format_srgb.h \
+	futex.h \
 	half_float.c \
 	half_float.h \
 	hash_table.c \
diff --git a/src/util/futex.h b/src/util/futex.h
new file mode 100644
index 0000000000..142c3b62f0
--- /dev/null
+++ b/src/util/futex.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2015 Intel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef UTIL_FUTEX_H
+#define UTIL_FUTEX_H
+
+#if defined(HAVE_FUTEX)
+
+#include <limits.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <linux/futex.h>
+#include <sys/syscall.h>
+#include <sys/time.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)
+{
+   return sys_futex(addr, FUTEX_WAKE, 1, NULL, NULL, 0);
+}
+
+static inline int futex_wait(uint32_t *addr, int32_t value)
+{
+   return sys_futex(addr, FUTEX_WAIT, value, NULL, NULL, 0);
+}
+
+#endif
+
+#endif /* UTIL_FUTEX_H */
diff --git a/src/util/meson.build b/src/util/meson.build
index c9cb3e861e..0940e4d12a 100644
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -37,6 +37,7 @@ files_mesa_util = files(
   'format_r11g11b10f.h',
   'format_rgb9e5.h',
   'format_srgb.h',
+  'futex.h',
   'half_float.c',
   'half_float.h',
   'hash_table.c',
diff --git a/src/util/simple_mtx.h b/src/util/simple_mtx.h
index d23a4303c8..0c2602d03b 100644
--- a/src/util/simple_mtx.h
+++ b/src/util/simple_mtx.h
@@ -21,6 +21,7 @@
  * IN THE SOFTWARE.
  */
 
+#include "util/futex.h"
 #include "util/u_thread.h"
 
 #if defined(__GNUC__) && defined(HAVE_FUTEX)
@@ -55,25 +56,6 @@ typedef struct {
 
 #define _SIMPLE_MTX_INITIALIZER_NP { 0 }
 
-#include <stdint.h>
-#include <values.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) {
-   return sys_futex(addr, FUTEX_WAKE, 1, 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)
 {