MCS lock, PF lock and Ticket lock have no arch specific implementation,
there is no need for the extra redirection in headers.
Signed-off-by: David Marchand <david.march...@redhat.com>
---
Note: this was mentionned during the seqlock patch review, and I spotted
it again, while reviewing the RISC-V port, and I see the same for a next
architecture too. So better clean this up as we don't need the
redirection.
---
MAINTAINERS | 4 ++--
lib/eal/arm/include/meson.build | 3 ---
lib/eal/arm/include/rte_mcslock.h | 22 -------------------
lib/eal/arm/include/rte_pflock.h | 18 ---------------
lib/eal/arm/include/rte_ticketlock.h | 22 -------------------
lib/eal/include/meson.build | 6 ++---
lib/eal/include/{generic => }/rte_mcslock.h | 8 +++++++
lib/eal/include/{generic => }/rte_pflock.h | 0
.../include/{generic => }/rte_ticketlock.h | 0
lib/eal/ppc/include/meson.build | 3 ---
lib/eal/ppc/include/rte_mcslock.h | 18 ---------------
lib/eal/ppc/include/rte_pflock.h | 17 --------------
lib/eal/ppc/include/rte_ticketlock.h | 18 ---------------
lib/eal/x86/include/meson.build | 3 ---
lib/eal/x86/include/rte_mcslock.h | 18 ---------------
lib/eal/x86/include/rte_pflock.h | 18 ---------------
lib/eal/x86/include/rte_ticketlock.h | 18 ---------------
17 files changed, 13 insertions(+), 183 deletions(-)
delete mode 100644 lib/eal/arm/include/rte_mcslock.h
delete mode 100644 lib/eal/arm/include/rte_pflock.h
delete mode 100644 lib/eal/arm/include/rte_ticketlock.h
rename lib/eal/include/{generic => }/rte_mcslock.h (98%)
rename lib/eal/include/{generic => }/rte_pflock.h (100%)
rename lib/eal/include/{generic => }/rte_ticketlock.h (100%)
delete mode 100644 lib/eal/ppc/include/rte_mcslock.h
delete mode 100644 lib/eal/ppc/include/rte_pflock.h
delete mode 100644 lib/eal/ppc/include/rte_ticketlock.h
delete mode 100644 lib/eal/x86/include/rte_mcslock.h
delete mode 100644 lib/eal/x86/include/rte_pflock.h
delete mode 100644 lib/eal/x86/include/rte_ticketlock.h
diff --git a/MAINTAINERS b/MAINTAINERS
index a1075613c0..c5944df3dc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -255,7 +255,7 @@ F: app/test/test_bitmap.c
MCSlock
M: Honnappa Nagarahalli <honnappa.nagaraha...@arm.com>
-F: lib/eal/include/generic/rte_mcslock.h
+F: lib/eal/include/rte_mcslock.h
F: app/test/test_mcslock.c
Sequence Lock
@@ -266,7 +266,7 @@ F: app/test/test_seqlock.c
Ticketlock
M: Joyce Kong <joyce.k...@arm.com>
-F: lib/eal/include/generic/rte_ticketlock.h
+F: lib/eal/include/rte_ticketlock.h
F: app/test/test_ticketlock.c
Pseudo-random Number Generation
diff --git a/lib/eal/arm/include/meson.build b/lib/eal/arm/include/meson.build
index 65c3aec35c..657bf58569 100644
--- a/lib/eal/arm/include/meson.build
+++ b/lib/eal/arm/include/meson.build
@@ -14,21 +14,18 @@ arch_headers = files(
'rte_cycles.h',
'rte_io_64.h',
'rte_io.h',
- 'rte_mcslock.h',
'rte_memcpy_32.h',
'rte_memcpy_64.h',
'rte_memcpy.h',
'rte_pause_32.h',
'rte_pause_64.h',
'rte_pause.h',
- 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch_32.h',
'rte_prefetch_64.h',
'rte_prefetch.h',
'rte_rwlock.h',
'rte_spinlock.h',
- 'rte_ticketlock.h',
'rte_vect.h',
)
install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
diff --git a/lib/eal/arm/include/rte_mcslock.h
b/lib/eal/arm/include/rte_mcslock.h
deleted file mode 100644
index 896d678073..0000000000
--- a/lib/eal/arm/include/rte_mcslock.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_MCSLOCK_ARM_H_
-#define _RTE_MCSLOCK_ARM_H_
-
-#ifndef RTE_FORCE_INTRINSICS
-# error Platform must be built with RTE_FORCE_INTRINSICS
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_mcslock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_MCSLOCK_ARM_H_ */
diff --git a/lib/eal/arm/include/rte_pflock.h b/lib/eal/arm/include/rte_pflock.h
deleted file mode 100644
index bb9934eec4..0000000000
--- a/lib/eal/arm/include/rte_pflock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2021 Microsoft Corporation
- */
-
-#ifndef _RTE_PFLOCK_ARM_H_
-#define _RTE_PFLOCK_ARM_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_pflock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_PFLOCK_ARM_H_ */
diff --git a/lib/eal/arm/include/rte_ticketlock.h
b/lib/eal/arm/include/rte_ticketlock.h
deleted file mode 100644
index e66beefbe2..0000000000
--- a/lib/eal/arm/include/rte_ticketlock.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_TICKETLOCK_ARM_H_
-#define _RTE_TICKETLOCK_ARM_H_
-
-#ifndef RTE_FORCE_INTRINSICS
-# error Platform must be built with RTE_FORCE_INTRINSICS
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_ticketlock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_TICKETLOCK_ARM_H_ */
diff --git a/lib/eal/include/meson.build b/lib/eal/include/meson.build
index 40ebb5b63d..fd6e844224 100644
--- a/lib/eal/include/meson.build
+++ b/lib/eal/include/meson.build
@@ -29,11 +29,13 @@ headers += files(
'rte_lcore.h',
'rte_log.h',
'rte_malloc.h',
+ 'rte_mcslock.h',
'rte_memory.h',
'rte_memzone.h',
'rte_pci_dev_feature_defs.h',
'rte_pci_dev_features.h',
'rte_per_lcore.h',
+ 'rte_pflock.h',
'rte_random.h',
'rte_reciprocal.h',
'rte_seqcount.h',
@@ -43,6 +45,7 @@ headers += files(
'rte_string_fns.h',
'rte_tailq.h',
'rte_thread.h',
+ 'rte_ticketlock.h',
'rte_time.h',
'rte_trace.h',
'rte_trace_point.h',
@@ -59,15 +62,12 @@ generic_headers = files(
'generic/rte_cpuflags.h',
'generic/rte_cycles.h',
'generic/rte_io.h',
- 'generic/rte_mcslock.h',
'generic/rte_memcpy.h',
'generic/rte_pause.h',
- 'generic/rte_pflock.h',
'generic/rte_power_intrinsics.h',
'generic/rte_prefetch.h',
'generic/rte_rwlock.h',
'generic/rte_spinlock.h',
- 'generic/rte_ticketlock.h',
'generic/rte_vect.h',
)
install_headers(generic_headers, subdir: 'generic')
diff --git a/lib/eal/include/generic/rte_mcslock.h
b/lib/eal/include/rte_mcslock.h
similarity index 98%
rename from lib/eal/include/generic/rte_mcslock.h
rename to lib/eal/include/rte_mcslock.h
index f15b785358..a805cb2906 100644
--- a/lib/eal/include/generic/rte_mcslock.h
+++ b/lib/eal/include/rte_mcslock.h
@@ -19,6 +19,10 @@
* they acquired the lock.
*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <rte_lcore.h>
#include <rte_common.h>
#include <rte_pause.h>
@@ -169,4 +173,8 @@ rte_mcslock_is_locked(rte_mcslock_t *msl)
return (__atomic_load_n(&msl, __ATOMIC_RELAXED) != NULL);
}
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _RTE_MCSLOCK_H_ */
diff --git a/lib/eal/include/generic/rte_pflock.h b/lib/eal/include/rte_pflock.h
similarity index 100%
rename from lib/eal/include/generic/rte_pflock.h
rename to lib/eal/include/rte_pflock.h
diff --git a/lib/eal/include/generic/rte_ticketlock.h
b/lib/eal/include/rte_ticketlock.h
similarity index 100%
rename from lib/eal/include/generic/rte_ticketlock.h
rename to lib/eal/include/rte_ticketlock.h
diff --git a/lib/eal/ppc/include/meson.build b/lib/eal/ppc/include/meson.build
index 1e1f39c05a..fa64330f01 100644
--- a/lib/eal/ppc/include/meson.build
+++ b/lib/eal/ppc/include/meson.build
@@ -8,15 +8,12 @@ arch_headers = files(
'rte_cpuflags.h',
'rte_cycles.h',
'rte_io.h',
- 'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
- 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rwlock.h',
'rte_spinlock.h',
- 'rte_ticketlock.h',
'rte_vect.h',
)
install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
diff --git a/lib/eal/ppc/include/rte_mcslock.h
b/lib/eal/ppc/include/rte_mcslock.h
deleted file mode 100644
index c58a6edc1c..0000000000
--- a/lib/eal/ppc/include/rte_mcslock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_MCSLOCK_PPC_64_H_
-#define _RTE_MCSLOCK_PPC_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_mcslock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_MCSLOCK_PPC_64_H_ */
diff --git a/lib/eal/ppc/include/rte_pflock.h b/lib/eal/ppc/include/rte_pflock.h
deleted file mode 100644
index 27c201b11d..0000000000
--- a/lib/eal/ppc/include/rte_pflock.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2021 Microsoft Corporation
- */
-#ifndef _RTE_PFLOCK_PPC_64_H_
-#define _RTE_PFLOCK_PPC_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_pflock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_PFLOCK_PPC_64_H_ */
diff --git a/lib/eal/ppc/include/rte_ticketlock.h
b/lib/eal/ppc/include/rte_ticketlock.h
deleted file mode 100644
index c175e9eab2..0000000000
--- a/lib/eal/ppc/include/rte_ticketlock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_TICKETLOCK_PPC_64_H_
-#define _RTE_TICKETLOCK_PPC_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_ticketlock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_TICKETLOCK_PPC_64_H_ */
diff --git a/lib/eal/x86/include/meson.build b/lib/eal/x86/include/meson.build
index 12c2e00035..52d2f8e969 100644
--- a/lib/eal/x86/include/meson.build
+++ b/lib/eal/x86/include/meson.build
@@ -7,16 +7,13 @@ arch_headers = files(
'rte_cpuflags.h',
'rte_cycles.h',
'rte_io.h',
- 'rte_mcslock.h',
'rte_memcpy.h',
'rte_pause.h',
- 'rte_pflock.h',
'rte_power_intrinsics.h',
'rte_prefetch.h',
'rte_rtm.h',
'rte_rwlock.h',
'rte_spinlock.h',
- 'rte_ticketlock.h',
'rte_vect.h',
)
arch_indirect_headers = files(
diff --git a/lib/eal/x86/include/rte_mcslock.h
b/lib/eal/x86/include/rte_mcslock.h
deleted file mode 100644
index a8f041a720..0000000000
--- a/lib/eal/x86/include/rte_mcslock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_MCSLOCK_X86_64_H_
-#define _RTE_MCSLOCK_X86_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_mcslock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_MCSLOCK_X86_64_H_ */
diff --git a/lib/eal/x86/include/rte_pflock.h b/lib/eal/x86/include/rte_pflock.h
deleted file mode 100644
index c2d876062c..0000000000
--- a/lib/eal/x86/include/rte_pflock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2021 Microsoft Corporation
- */
-
-#ifndef _RTE_PFLOCK_X86_64_H_
-#define _RTE_PFLOCK_X86_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_pflock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_PFLOCK_X86_64_H_ */
diff --git a/lib/eal/x86/include/rte_ticketlock.h
b/lib/eal/x86/include/rte_ticketlock.h
deleted file mode 100644
index 0cc01f6b92..0000000000
--- a/lib/eal/x86/include/rte_ticketlock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_TICKETLOCK_X86_64_H_
-#define _RTE_TICKETLOCK_X86_64_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_ticketlock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_TICKETLOCK_X86_64_H_ */
--
2.36.1
