vincenzopalazzo
/
rt-tests
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove --numa option 

Signed-off-by: John Kacur <jkacur@redhat.com>
This commit is contained in:
John Kacur 2018-06-19 01:38:48 +02:00
parent 8436a798b3
commit be3ef7f9d2
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/cyclictest/cyclictest.c
View File

@ -1207,7 +1207,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
{"spike-nodes", required_argument, NULL, OPT_TRIGGER_NODES }, {"spike-nodes", required_argument, NULL, OPT_TRIGGER_NODES },
{"threads", optional_argument, NULL, OPT_THREADS }, {"threads", optional_argument, NULL, OPT_THREADS },
{"unbuffered", no_argument, NULL, OPT_UNBUFFERED }, {"unbuffered", no_argument, NULL, OPT_UNBUFFERED },
{"numa", no_argument, NULL, OPT_NUMA },
{"verbose", no_argument, NULL, OPT_VERBOSE }, {"verbose", no_argument, NULL, OPT_VERBOSE },
{"dbg_cyclictest", no_argument, NULL, OPT_DBGCYCLIC }, {"dbg_cyclictest", no_argument, NULL, OPT_DBGCYCLIC },
{"policy", required_argument, NULL, OPT_POLICY }, {"policy", required_argument, NULL, OPT_POLICY },
@ -1215,7 +1214,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
{"posix_timers", no_argument, NULL, OPT_POSIX_TIMERS }, {"posix_timers", no_argument, NULL, OPT_POSIX_TIMERS },
{NULL, 0, NULL, 0 }, {NULL, 0, NULL, 0 },
}; };
int c = getopt_long(argc, argv, "a::A::b:c:d:D:h:H:i:l:MNo:p:mqrRsSt::uUvD:x", int c = getopt_long(argc, argv, "a::A::b:c:d:D:h:H:i:l:MNo:p:mqrRsSt::uvD:x",
long_options, &option_index); long_options, &option_index);
if (c == -1) if (c == -1)
break; break;
@ -1350,20 +1349,6 @@ static void process_options (int argc, char *argv[], int max_cpus)
case 'u': case 'u':
case OPT_UNBUFFERED: case OPT_UNBUFFERED:
setvbuf(stdout, NULL, _IONBF, 0); break; setvbuf(stdout, NULL, _IONBF, 0); break;
case 'U':
case OPT_NUMA: /* NUMA testing */
numa = 1; /* Turn numa on */
if (smp)
fatal("numa and smp options are mutually exclusive\n");
numa_on_and_available();
#ifdef NUMA
num_threads = max_cpus;
setaffinity = AFFINITY_USEALL;
#else
warn("cyclictest was not built with the numa option\n");
warn("ignoring --numa or -U\n");
#endif
break;
case 'v': case 'v':
case OPT_VERBOSE: verbose = 1; break; case OPT_VERBOSE: verbose = 1; break;
case 'x': case 'x':
@ -1399,6 +1384,19 @@ static void process_options (int argc, char *argv[], int max_cpus)
} }
} }
if (!smp) { /* if smp wasn't requested, test for numa automatically */
#ifdef NUMA
if (numa_available() != -1) {
numa = 1;
num_threads = max_cpus;
setaffinity = AFFINITY_USEALL;
#else
warn("cyclictest was not built with the numa option\n");
numa = 0;
#endif
}
}
if (option_affinity) { if (option_affinity) {
if (smp) { if (smp) {
warn("-a ignored due to --smp\n"); warn("-a ignored due to --smp\n");

6
src/cyclictest/rt_numa.h
View File

@ -192,12 +192,6 @@ static inline void rt_bitmask_free(struct bitmask *mask)
#endif /* LIBNUMA_API_VERSION */ #endif /* LIBNUMA_API_VERSION */
static void numa_on_and_available()
{
if (numa && (numa_available() == -1))
fatal("--numa specified and numa functions not available.\n");
}
#else /* ! NUMA */ #else /* ! NUMA */
struct bitmask { struct bitmask {