[PATCH rt-tests v4 06/16] rt-numa: Remove unused definitions and numa_initialize()
From: Daniel Wagner <hidden>
Date: 2021-02-10 13:36:50
Subsystem:
the rest · Maintainer:
Linus Torvalds
There is no user left of the AFFINITY_* enum. Remove them. Also there is no need for numa_initialize() to prodect from being called several times. We can safely initialize libnuma at the begin of each program. Signed-off-by: Daniel Wagner <redacted> --- src/cyclictest/cyclictest.c | 2 +- src/include/rt-numa.h | 8 -------- src/lib/rt-numa.c | 15 --------------- src/signaltest/signaltest.c | 2 +- 4 files changed, 2 insertions(+), 25 deletions(-)
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index b5cca3ae166b..3c6773c1dbb5 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c@@ -1705,7 +1705,7 @@ int main(int argc, char **argv) void *currstk; size_t stksize; - if (numa_initialize()) + if (numa_available() == -1) fatal("Couldn't initialize libnuma"); process_options(argc, argv, max_cpus);
diff --git a/src/include/rt-numa.h b/src/include/rt-numa.h
index ca86a45dab3a..54f5c3a240e9 100644
--- a/src/include/rt-numa.h
+++ b/src/include/rt-numa.h@@ -4,14 +4,6 @@ #include <numa.h> -enum { - AFFINITY_UNSPECIFIED, - AFFINITY_SPECIFIED, - AFFINITY_USEALL -}; - -int numa_initialize(void); - int get_available_cpus(struct bitmask *cpumask); int cpu_for_thread_sp(int thread_num, int max_cpus, struct bitmask *cpumask); int cpu_for_thread_ua(int thread_num, int max_cpus);
diff --git a/src/lib/rt-numa.c b/src/lib/rt-numa.c
index 33fddba4358e..fa83eae61084 100644
--- a/src/lib/rt-numa.c
+++ b/src/lib/rt-numa.c@@ -13,21 +13,6 @@ #include "error.h" #include "rt-numa.h" -/* numa_available() must be called before any other calls to the numa library */ -int numa_initialize(void) -{ - static int is_initialized; - - if (is_initialized == 1) - return 0; - - if (numa_available() == -1) - return -1; - - is_initialized = 1; - return 0; -} - int get_available_cpus(struct bitmask *cpumask) { if (cpumask)
diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c
index 61420fa13347..41ebb2c87a2f 100644
--- a/src/signaltest/signaltest.c
+++ b/src/signaltest/signaltest.c@@ -322,7 +322,7 @@ int main(int argc, char **argv) int status, cpu; int max_cpus = sysconf(_SC_NPROCESSORS_ONLN); - if (numa_initialize()) + if (numa_available() == -1) fatal("Couldn't initialize libnuma"); process_options(argc, argv, max_cpus);
--
2.30.0