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

Revert "shuffle numa options around a bit" 

Redoing the removal of the numa option

This reverts commit 1e4b4dc250.

Signed-off-by: John Kacur <jkacur@redhat.com>
This commit is contained in:
John Kacur 2018-06-18 23:22:57 +02:00
parent 026f2a31c5
commit 54b1ce911c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cyclictest/cyclictest.c
View File

@ -1713,9 +1713,7 @@ static void trigger_update(struct thread_param *par, int diff, int64_t ts)
void get_cpu_affinity(struct bitmask *cpus)
{
struct bitmask *bitmask = numa_allocate_cpumask();
#if NUMA
numa_sched_getaffinity(0, bitmask);
#else
#if 0
int i, max_cpus = numa_num_configured_cpus();
cpu_set_t mask;
int ret = sched_getaffinity(0, sizeof(mask), &mask);
@ -1731,9 +1729,10 @@ void get_cpu_affinity(struct bitmask *cpus)
numa_bitmask_setbit(bitmask, i);
}
}
#else
numa_sched_getaffinity(0, bitmask);
#endif
/* copy the contents to our argument */
*cpus = *bitmask;
cpus = bitmask;
}
int main(int argc, char **argv)
@ -1744,7 +1743,7 @@ int main(int argc, char **argv)
int max_cpus = sysconf(_SC_NPROCESSORS_ONLN);
int i, ret = -1;
int status;
int numa = numa_available() == 0 ? 1 : 0;
int numa = numa_available();
get_cpu_affinity(&allowed_cpus);

2
src/cyclictest/rt_numa.h
View File

@ -23,6 +23,8 @@
#include "rt-utils.h"
#include "error.h"
static int numa = 0;
#ifdef NUMA
#include <numa.h>