diff options
author | Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> | 2017-10-22 14:41:56 +0300 |
---|---|---|
committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2018-01-18 22:07:22 +0300 |
commit | cd2dfa966f8c08c99feda2d0622ecc27c0361245 (patch) | |
tree | 4eb21ff4ee4452cd55e0160e40ac90ea69c9d192 | |
parent | f831c691a20ca2d0ffbbf707f43eee7600bca6b6 (diff) |
linux-gen, include: switch barrier.h to api+abi
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
-rw-r--r-- | include/Makefile.am | 7 | ||||
-rw-r--r-- | include/odp/api/abi-default/barrier.h (renamed from platform/linux-generic/include/odp/api/plat/barrier_types.h) | 4 | ||||
-rw-r--r-- | include/odp/arch/arm32-linux/odp/api/abi/barrier.h | 7 | ||||
-rw-r--r-- | include/odp/arch/arm64-linux/odp/api/abi/barrier.h | 7 | ||||
-rw-r--r-- | include/odp/arch/mips64-linux/odp/api/abi/barrier.h | 7 | ||||
-rw-r--r-- | include/odp/arch/power64-linux/odp/api/abi/barrier.h | 7 | ||||
-rw-r--r-- | include/odp/arch/x86_32-linux/odp/api/abi/barrier.h | 7 | ||||
-rw-r--r-- | include/odp/arch/x86_64-linux/odp/api/abi/barrier.h | 7 | ||||
-rw-r--r-- | platform/linux-generic/Makefile.am | 2 | ||||
-rw-r--r-- | platform/linux-generic/include-abi/odp/api/abi/barrier.h | 38 | ||||
-rw-r--r-- | platform/linux-generic/include/odp/api/barrier.h | 6 |
11 files changed, 93 insertions, 6 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index ac7239a2e..dd5dbd82f 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -56,6 +56,7 @@ nodist_odpapispecinclude_HEADERS = \ odpapiabidefaultincludedir= $(includedir)/odp/api/abi-default odpapiabidefaultinclude_HEADERS = \ + odp/api/abi-default/barrier.h \ odp/api/abi-default/buffer.h \ odp/api/abi-default/classification.h \ odp/api/abi-default/crypto.h \ @@ -71,6 +72,7 @@ if ODP_ABI_COMPAT odpapiabiarchincludedir = $(archincludedir)/odp/api/abi if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ + odp/arch/arm32-linux/odp/api/abi/barrier.h \ odp/arch/arm32-linux/odp/api/abi/buffer.h \ odp/arch/arm32-linux/odp/api/abi/classification.h \ odp/arch/arm32-linux/odp/api/abi/crypto.h \ @@ -82,6 +84,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_AARCH64 odpapiabiarchinclude_HEADERS = \ + odp/arch/arm64-linux/odp/api/abi/barrier.h \ odp/arch/arm64-linux/odp/api/abi/buffer.h \ odp/arch/arm64-linux/odp/api/abi/classification.h \ odp/arch/arm64-linux/odp/api/abi/crypto.h \ @@ -93,6 +96,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_MIPS64 odpapiabiarchinclude_HEADERS = \ + odp/arch/mips64-linux/odp/api/abi/barrier.h \ odp/arch/mips64-linux/odp/api/abi/buffer.h \ odp/arch/mips64-linux/odp/api/abi/classification.h \ odp/arch/mips64-linux/odp/api/abi/crypto.h \ @@ -104,6 +108,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_POWERPC odpapiabiarchinclude_HEADERS = \ + odp/arch/power64-linux/odp/api/abi/barrier.h \ odp/arch/power64-linux/odp/api/abi/buffer.h \ odp/arch/power64-linux/odp/api/abi/classification.h \ odp/arch/power64-linux/odp/api/abi/crypto.h \ @@ -115,6 +120,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_X86_32 odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_32-linux/odp/api/abi/barrier.h \ odp/arch/x86_32-linux/odp/api/abi/buffer.h \ odp/arch/x86_32-linux/odp/api/abi/classification.h \ odp/arch/x86_32-linux/odp/api/abi/crypto.h \ @@ -126,6 +132,7 @@ odpapiabiarchinclude_HEADERS = \ endif if ARCH_IS_X86_64 odpapiabiarchinclude_HEADERS = \ + odp/arch/x86_64-linux/odp/api/abi/barrier.h \ odp/arch/x86_64-linux/odp/api/abi/buffer.h \ odp/arch/x86_64-linux/odp/api/abi/classification.h \ odp/arch/x86_64-linux/odp/api/abi/crypto.h \ diff --git a/platform/linux-generic/include/odp/api/plat/barrier_types.h b/include/odp/api/abi-default/barrier.h index 00b383cc6..51d913774 100644 --- a/platform/linux-generic/include/odp/api/plat/barrier_types.h +++ b/include/odp/api/abi-default/barrier.h @@ -10,8 +10,8 @@ * ODP barrier */ -#ifndef ODP_BARRIER_TYPES_H_ -#define ODP_BARRIER_TYPES_H_ +#ifndef ODP_ABI_BARRIER_H_ +#define ODP_ABI_BARRIER_H_ #ifdef __cplusplus extern "C" { diff --git a/include/odp/arch/arm32-linux/odp/api/abi/barrier.h b/include/odp/arch/arm32-linux/odp/api/abi/barrier.h new file mode 100644 index 000000000..9d6c256eb --- /dev/null +++ b/include/odp/arch/arm32-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/include/odp/arch/arm64-linux/odp/api/abi/barrier.h b/include/odp/arch/arm64-linux/odp/api/abi/barrier.h new file mode 100644 index 000000000..9d6c256eb --- /dev/null +++ b/include/odp/arch/arm64-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/include/odp/arch/mips64-linux/odp/api/abi/barrier.h b/include/odp/arch/mips64-linux/odp/api/abi/barrier.h new file mode 100644 index 000000000..9d6c256eb --- /dev/null +++ b/include/odp/arch/mips64-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/include/odp/arch/power64-linux/odp/api/abi/barrier.h b/include/odp/arch/power64-linux/odp/api/abi/barrier.h new file mode 100644 index 000000000..9d6c256eb --- /dev/null +++ b/include/odp/arch/power64-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h b/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h new file mode 100644 index 000000000..9d6c256eb --- /dev/null +++ b/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h b/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h new file mode 100644 index 000000000..9d6c256eb --- /dev/null +++ b/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2017, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 7289eda83..5231c2e2d 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -76,7 +76,6 @@ odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ include/odp/api/plat/atomic_inlines.h \ include/odp/api/plat/atomic_types.h \ - include/odp/api/plat/barrier_types.h \ include/odp/api/plat/byteorder_inlines.h \ include/odp/api/plat/byteorder_types.h \ include/odp/api/plat/cpumask_types.h \ @@ -113,6 +112,7 @@ nodist_odpapiplatinclude_HEADERS = \ if !ODP_ABI_COMPAT odpapiabiarchincludedir = $(archincludedir)/odp/api/abi odpapiabiarchinclude_HEADERS = \ + include-abi/odp/api/abi/barrier.h \ include-abi/odp/api/abi/buffer.h \ include-abi/odp/api/abi/classification.h \ include-abi/odp/api/abi/crypto.h \ diff --git a/platform/linux-generic/include-abi/odp/api/abi/barrier.h b/platform/linux-generic/include-abi/odp/api/abi/barrier.h new file mode 100644 index 000000000..51d913774 --- /dev/null +++ b/platform/linux-generic/include-abi/odp/api/abi/barrier.h @@ -0,0 +1,38 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * ODP barrier + */ + +#ifndef ODP_ABI_BARRIER_H_ +#define ODP_ABI_BARRIER_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <odp/api/std_types.h> +#include <odp/api/atomic.h> + +/** + * @internal + * ODP thread synchronization barrier + */ +struct odp_barrier_s { + uint32_t count; /**< Thread count */ + odp_atomic_u32_t bar; /**< Barrier counter */ +}; + +typedef struct odp_barrier_s odp_barrier_t; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/include/odp/api/barrier.h b/platform/linux-generic/include/odp/api/barrier.h index 44e59155a..7101b4c64 100644 --- a/platform/linux-generic/include/odp/api/barrier.h +++ b/platform/linux-generic/include/odp/api/barrier.h @@ -10,8 +10,8 @@ * ODP execution barriers */ -#ifndef ODP_PLAT_BARRIER_H_ -#define ODP_PLAT_BARRIER_H_ +#ifndef ODP_API_BARRIER_H_ +#define ODP_API_BARRIER_H_ #ifdef __cplusplus extern "C" { @@ -20,7 +20,7 @@ extern "C" { #include <odp/api/std_types.h> #include <odp/api/atomic.h> #include <odp/api/abi/shared_memory.h> -#include <odp/api/plat/barrier_types.h> +#include <odp/api/abi/barrier.h> #include <odp/api/spec/barrier.h> |