From b4b2a951c8b4c1315c06cb4d58dbc787949daa4c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Sun, 22 Oct 2017 17:38:26 +0200 Subject: [PATCH] util: move futex helpers into futex.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit v2: style fixes Reviewed-by: Marek Olšák (v1) --- src/util/Makefile.sources | 1 + src/util/futex.h | 53 +++++++++++++++++++++++++++++++++++++++ src/util/meson.build | 1 + src/util/simple_mtx.h | 23 ++--------------- 4 files changed, 57 insertions(+), 21 deletions(-) create mode 100644 src/util/futex.h diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index 9393f6a4816..f8096feb232 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 00000000000..722cdd35f67 --- /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_LINUX_FUTEX_H) + +#include +#include +#include +#include +#include +#include + +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); +} + +#endif + +#endif /* UTIL_FUTEX_H */ diff --git a/src/util/meson.build b/src/util/meson.build index 0145d9cbe33..a9ab5bf545c 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 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 -#include -#include -#include - -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) { -- 2.30.2