rt-tests: cyclictest: Without -t default to 1 thread in numa case

Don't ignore -t num when detecting if numa support is available.

Also, don't be too smart about details in the case of numa support
This means, if -t is not specified then the default is 1.

affinity must also be explicily set.

Signed-off-by: John Kacur <jkacur@redhat.com>
This commit is contained in:
John Kacur 2019-08-14 00:12:35 +02:00
parent 8eb3f81f04
commit a17551938c
1 changed files with 4 additions and 7 deletions

View File

@ -1183,6 +1183,7 @@ static void process_options (int argc, char *argv[], int max_cpus)
case 'a':
case OPT_AFFINITY:
option_affinity = 1;
/* smp sets AFFINITY_USEALL in OPT_SMP */
if (smp)
break;
if (optarg != NULL) {
@ -1345,15 +1346,11 @@ static void process_options (int argc, char *argv[], int max_cpus)
}
}
if (!smp) { /* if smp wasn't requested, test for numa automatically */
/* if smp wasn't requested, test for numa automatically */
if (!smp) {
#ifdef NUMA
if (numa_available() != -1) {
if (numa_available() != -1)
numa = 1;
if (setaffinity == AFFINITY_UNSPECIFIED) {
num_threads = max_cpus;
setaffinity = AFFINITY_USEALL;
}
}
#else
warn("cyclictest was not built with the numa option\n");
numa = 0;