[Mesa-dev] [PATCH 1/7] util: move futex helpers into futex.h
Marek Olšák
maraeo at gmail.com
Fri Oct 27 16:38:45 UTC 2017
For patches 1-4, 6, 7, assuming you fix the double unlock in patch 7:
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Marek
On Sun, Oct 22, 2017 at 8:33 PM, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
> ---
> src/util/Makefile.sources | 1 +
> src/util/futex.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++
> src/util/meson.build | 1 +
> src/util/simple_mtx.h | 20 +------------------
> 4 files changed, 54 insertions(+), 19 deletions(-)
> create mode 100644 src/util/futex.h
>
> diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
> index c7f6516a992..407b2825624 100644
> --- a/src/util/Makefile.sources
> +++ b/src/util/Makefile.sources
> @@ -6,20 +6,21 @@ MESA_UTIL_FILES := \
> build_id.h \
> crc32.c \
> crc32.h \
> debug.c \
> debug.h \
> disk_cache.c \
> disk_cache.h \
> format_r11g11b10f.h \
> format_rgb9e5.h \
> format_srgb.h \
> + futex.h \
> half_float.c \
> half_float.h \
> hash_table.c \
> hash_table.h \
> list.h \
> macros.h \
> mesa-sha1.c \
> mesa-sha1.h \
> sha1/sha1.c \
> sha1/sha1.h \
> diff --git a/src/util/futex.h b/src/util/futex.h
> new file mode 100644
> index 00000000000..a79daaf209b
> --- /dev/null
> +++ b/src/util/futex.h
> @@ -0,0 +1,51 @@
> +/*
> + * 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 c9cb3e861e9..0940e4d12a7 100644
> --- a/src/util/meson.build
> +++ b/src/util/meson.build
> @@ -30,20 +30,21 @@ files_mesa_util = files(
> 'build_id.h',
> 'crc32.c',
> 'crc32.h',
> 'debug.c',
> 'debug.h',
> 'disk_cache.c',
> 'disk_cache.h',
> 'format_r11g11b10f.h',
> 'format_rgb9e5.h',
> 'format_srgb.h',
> + 'futex.h',
> 'half_float.c',
> 'half_float.h',
> 'hash_table.c',
> 'hash_table.h',
> 'list.h',
> 'macros.h',
> 'mesa-sha1.c',
> 'mesa-sha1.h',
> 'sha1/sha1.c',
> 'sha1/sha1.h',
> diff --git a/src/util/simple_mtx.h b/src/util/simple_mtx.h
> index d23a4303c80..0c2602d03b6 100644
> --- a/src/util/simple_mtx.h
> +++ b/src/util/simple_mtx.h
> @@ -14,20 +14,21 @@
> *
> * 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.
> */
>
> +#include "util/futex.h"
> #include "util/u_thread.h"
>
> #if defined(__GNUC__) && defined(HAVE_FUTEX)
>
> /* mtx_t - Fast, simple mutex
> *
> * While modern pthread mutexes are very fast (implemented using futex), they
> * still incur a call to an external DSO and overhead of the generality and
> * features of pthread mutexes. Most mutexes in mesa only needs lock/unlock,
> * and the idea here is that we can inline the atomic operation and make the
> @@ -48,39 +49,20 @@
> * A fast mutex only supports lock/unlock, can't be recursive or used with
> * condition variables.
> */
>
> typedef struct {
> uint32_t val;
> } simple_mtx_t;
>
> #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)
> {
> assert(type == mtx_plain);
>
> mtx->val = 0;
> }
>
> static inline void
> simple_mtx_destroy(simple_mtx_t *mtx)
> --
> 2.11.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
More information about the mesa-dev
mailing list