diff options
| author | John Kacur <jkacur@redhat.com> | 2021-02-19 13:28:08 -0500 |
|---|---|---|
| committer | John Kacur <jkacur@redhat.com> | 2021-02-19 13:32:42 -0500 |
| commit | 6b9ac7550872702ee8e09db98a622c2cd2fe7a34 (patch) | |
| tree | a44cbf2709ec6a07d0136cf8bee77361f7df4a12 | |
| parent | c30fa9fad6aec03b88c8c4263a78fe390a49c1f1 (diff) | |
| download | rt-tests-6b9ac7550872702ee8e09db98a622c2cd2fe7a34.tar.gz | |
Revert "signaltest: Always use libnuma"
This reverts commit 3079f1b10d086b878f52607035b328f450b8033e.
libnuma is a build-time requirement but not a runtime requirement
Signed-off-by: John Kacur <jkacur@redhat.com>
| -rw-r--r-- | src/signaltest/signaltest.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c index 1d1b070..4f8e7ca 100644 --- a/src/signaltest/signaltest.c +++ b/src/signaltest/signaltest.c @@ -207,6 +207,7 @@ static int quiet; static int lockall; static struct bitmask *affinity_mask = NULL; static int smp = 0; +static int numa = 0; static int setaffinity = AFFINITY_UNSPECIFIED; static char outfile[MAX_PATH]; @@ -222,7 +223,6 @@ static void process_options(int argc, char *argv[], unsigned int max_cpus) { int option_affinity = 0; int error = 0; - int numa = 0; for (;;) { int option_index = 0; @@ -253,6 +253,8 @@ static void process_options(int argc, char *argv[], unsigned int max_cpus) /* smp sets AFFINITY_USEALL in OPT_SMP */ if (smp) break; + if (numa_initialize()) + fatal("Couldn't initialize libnuma"); numa = 1; if (optarg) { parse_cpumask(optarg, max_cpus, &affinity_mask); @@ -337,6 +339,9 @@ static void process_options(int argc, char *argv[], unsigned int max_cpus) /* if smp wasn't requested, test for numa automatically */ if (!smp) { + if (numa_initialize()) + fatal("Couldn't initialize libnuma"); + numa = 1; if (setaffinity == AFFINITY_UNSPECIFIED) setaffinity = AFFINITY_USEALL; } @@ -412,9 +417,6 @@ int main(int argc, char **argv) int status, cpu; int max_cpus = sysconf(_SC_NPROCESSORS_ONLN); - if (numa_initialize()) - fatal("Couldn't initialize libnuma"); - process_options(argc, argv, max_cpus); if (check_privs()) |