Don't offer --numa option when unavailable
Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
Signed-off-by: Clark Williams <williams@redhat.com>
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index c3fa60f..23706c7 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1034,8 +1034,10 @@
"-T TRACE --tracer=TRACER set tracing function\n"
" configured tracers: %s\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"
"-w --wakeup task wakeup tracing (used with -b)\n"
@@ -1113,10 +1115,10 @@
if (!affinity_mask)
display_help(1);
- if (verbose) {
+// if (verbose) {
printf("%s: Using %u cpus.\n", __func__,
rt_numa_bitmask_count(affinity_mask));
- }
+// }
}
@@ -1241,9 +1243,11 @@
if (smp || numa)
break;
if (optarg != NULL) {
+ printf("optarg != NULL!\n");
parse_cpumask(optarg, max_cpus);
setaffinity = AFFINITY_SPECIFIED;
} else if (optind<argc && atoi(argv[optind])) {
+ printf("optind < argc\n");
parse_cpumask(argv[optind], max_cpus);
setaffinity = AFFINITY_SPECIFIED;
} else {
@@ -1983,7 +1987,7 @@
case AFFINITY_UNSPECIFIED: par->cpu = -1; break;
case AFFINITY_SPECIFIED:
par->cpu = cpu_for_thread(i, max_cpus);
- if (verbose)
+ //if (verbose)
printf("Thread %d using cpu %d.\n", i,
par->cpu);
break;
