rt-tests/SOURCES/rt-tests-cyclictest-Remove-numa-from-help.patch
2021-09-10 04:02:41 +00:00

86 lines
3.3 KiB
Diff

From 7ea837b01d7e75e403a935bb40b11824f8568d4a Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Mon, 5 Nov 2018 15:11:31 +0100
Subject: [PATCH] rt-tests: cyclictest: Remove numa from help
The numa mode is invoked automatically now, and not from the commandline.
Remove it from help and the man page as well.
Clean-up messages to refer to "numa" or "numa" mode instead of "--numa"
Even though --smp can still be invoked, change messages to "smp mode"
for consistency.
Signed-off-by: John Kacur <jkacur@redhat.com>
---
src/cyclictest/cyclictest.8 | 3 ---
src/cyclictest/cyclictest.c | 10 +++-------
src/cyclictest/rt_numa.h | 2 +-
3 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/cyclictest/cyclictest.8 b/src/cyclictest/cyclictest.8
index 36edacc3209f..a05d1f4c9d4a 100644
--- a/src/cyclictest/cyclictest.8
+++ b/src/cyclictest/cyclictest.8
@@ -185,9 +185,6 @@ of the trace functions available from <debugfs-mountpoint>/kernel/debug/tracing/
.B \-u, \-\-unbuffered
force unbuffered output for live processing
.TP
-.B \-U, --numa
-Standard NUMA testing (similar to SMP option) thread data structures allocated from local node.
-.TP
.B \-v, \-\-verbose
Output values on stdout for statistics. This option is used to gather statistical information about the latency distribution. The output is sent to stdout. The output format is:
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 8bba9fc63ee3..188a202c5171 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1025,10 +1025,6 @@ static void display_help(int error)
" without -t default = 1\n"
" --tracemark write a trace mark when -b latency is exceeded\n"
"-u --unbuffered force unbuffered output for live processing\n"
-#ifdef NUMA
- "-U --numa Standard NUMA testing (similar to SMP option)\n"
- " thread data structures allocated from local node\n"
-#endif
"-v --verbose output values on stdout for statistics\n"
" format: n:c:v n=tasknum c=count v=value in us\n"
" --dbg_cyclictest print info useful for debugging cyclictest\n"
@@ -1329,7 +1325,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
case 't':
case OPT_THREADS:
if (smp) {
- warn("-t ignored due to --smp\n");
+ warn("-t ignored due to smp mode\n");
break;
}
if (optarg != NULL)
@@ -1399,9 +1395,9 @@ static void process_options (int argc, char *argv[], int max_cpus)
if (option_affinity) {
if (smp) {
- warn("-a ignored due to --smp\n");
+ warn("-a ignored due to smp mode\n");
} else if (numa) {
- warn("-a ignored due to --numa\n");
+ warn("-a ignored due to numa mode\n");
}
}
diff --git a/src/cyclictest/rt_numa.h b/src/cyclictest/rt_numa.h
index 3970e681fe7b..e8cd7f481baa 100644
--- a/src/cyclictest/rt_numa.h
+++ b/src/cyclictest/rt_numa.h
@@ -253,7 +253,7 @@ static inline void rt_bitmask_free(struct bitmask *mask)
static void numa_on_and_available()
{
if (numa) /* NUMA is not defined here */
- fatal("--numa specified and numa functions not available.\n");
+ fatal("numa mode and numa functions not available.\n");
}
#endif /* NUMA */
--
2.14.5