[PATCH rt-tests v4 13/16] rt-numa: Remove used max_cpus argument from cpu_for_thread()
From: Daniel Wagner <hidden>
Date: 2021-02-10 13:37:23
Subsystem:
the rest · Maintainer:
Linus Torvalds
There is no need to pass in the max_cpus anymore. Thus remove the argument. Signed-off-by: Daniel Wagner <redacted> --- src/cyclictest/cyclictest.c | 2 +- src/include/rt-numa.h | 2 +- src/lib/rt-numa.c | 10 +++++----- src/signaltest/signaltest.c | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 366b2aaaa9f8..7a0501031857 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c@@ -1882,7 +1882,7 @@ int main(int argc, char **argv) if (status != 0) fatal("error from pthread_attr_init for thread %d: %s\n", i, strerror(status)); - cpu = cpu_for_thread(i, max_cpus, affinity_mask); + cpu = cpu_for_thread(i, affinity_mask); if (verbose) printf("Thread %d using cpu %d.\n", i, cpu);
diff --git a/src/include/rt-numa.h b/src/include/rt-numa.h
index 446ce54a6ba2..405e57869735 100644
--- a/src/include/rt-numa.h
+++ b/src/include/rt-numa.h@@ -5,7 +5,7 @@ #include <numa.h> int get_available_cpus(struct bitmask *cpumask); -int cpu_for_thread(int thread_num, int max_cpus, struct bitmask *cpumask); +int cpu_for_thread(int thread_num, struct bitmask *cpumask); int parse_cpumask(char *str, struct bitmask **cpumask);
diff --git a/src/lib/rt-numa.c b/src/lib/rt-numa.c
index 45d4f1193d5f..04f2e9adb4b1 100644
--- a/src/lib/rt-numa.c
+++ b/src/lib/rt-numa.c@@ -21,7 +21,7 @@ int get_available_cpus(struct bitmask *cpumask) return numa_num_task_cpus(); } -static int cpu_for_thread_sp(int thread_num, int max_cpus, struct bitmask *cpumask) +static int cpu_for_thread_sp(int thread_num, struct bitmask *cpumask) { unsigned int m, cpu, i, num_cpus;
@@ -44,7 +44,7 @@ static int cpu_for_thread_sp(int thread_num, int max_cpus, struct bitmask *cpuma return 0; } -static int cpu_for_thread_ua(int thread_num, int max_cpus) +static int cpu_for_thread_ua(int thread_num) { int res, num_cpus, i, m, cpu; pthread_t thread;
@@ -72,12 +72,12 @@ static int cpu_for_thread_ua(int thread_num, int max_cpus) return 0; } -int cpu_for_thread(int thread_num, int max_cpus, struct bitmask *cpumask) +int cpu_for_thread(int thread_num, struct bitmask *cpumask) { if (cpumask) - return cpu_for_thread_sp(thread_num, max_cpus, cpumask); + return cpu_for_thread_sp(thread_num, cpumask); else - return cpu_for_thread_ua(thread_num, max_cpus); + return cpu_for_thread_ua(thread_num); } /*
diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c
index 3ca26fb373bb..5427db7f8d85 100644
--- a/src/signaltest/signaltest.c
+++ b/src/signaltest/signaltest.c@@ -320,7 +320,6 @@ int main(int argc, char **argv) struct thread_stat *stat; int i, ret = -1; int status, cpu; - int max_cpus = sysconf(_SC_NPROCESSORS_ONLN); if (numa_available() == -1) fatal("Couldn't initialize libnuma");
@@ -373,7 +372,7 @@ int main(int argc, char **argv) par[i].bufmsk = VALBUF_SIZE - 1; } - cpu = cpu_for_thread(i, max_cpus, affinity_mask); + cpu = cpu_for_thread(i, affinity_mask); if (verbose) printf("Thread %d using cpu %d.\n", i, cpu);
--
2.30.0