[LTP] [PATCH V2 7/7] pi_test: use only available CPUs
Stanislav Kholmanskikh
stanislav.kholmanskikh@oracle.com
Fri Dec 25 17:18:01 CET 2015
The current code expects that cpu0..cpu7 are online and breaks
if the system has more CPUs and/or some of them are offline.
This patch removes these expectations. Now we determine the set
of available CPUs at runtime and bind each thread only to a CPU in
this set.
Signed-off-by: Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
---
Changes since V1:
* It turned out that calling sysconf(_SC_NPROCESSORS_*) from many
threads at the same time is not safe. Sometimes it returns odd results.
Therefore, I made ncpus_online, ncpus_max global. They are assigned
in setup() once and only from the main thread.
* Moved the definition of *tp and tplen into the header. Anyway I
it's defined in each *.c file
* Renamed init_tparam() into setup() and changed its arguments.
* Removed test_calloc(), since it's used only in one place.
.../functional/threads/include/pitest.h | 161 +++++++++++++++++---
.../functional/threads/pi_test/pitest-1.c | 28 ++--
.../functional/threads/pi_test/pitest-2.c | 27 ++--
.../functional/threads/pi_test/pitest-3.c | 27 ++--
.../functional/threads/pi_test/pitest-4.c | 37 ++---
.../functional/threads/pi_test/pitest-5.c | 39 ++---
.../functional/threads/pi_test/pitest-6.c | 29 ++--
7 files changed, 211 insertions(+), 137 deletions(-)
diff --git a/testcases/open_posix_testsuite/functional/threads/include/pitest.h b/testcases/open_posix_testsuite/functional/threads/include/pitest.h
index 8c719e5..0dd7d67 100644
--- a/testcases/open_posix_testsuite/functional/threads/include/pitest.h
+++ b/testcases/open_posix_testsuite/functional/threads/include/pitest.h
@@ -25,6 +25,31 @@
#define PROTOCOL PTHREAD_PRIO_INHERIT
+#ifndef CPU_ALLOC
+#define CPU_ALLOC(ncpus) malloc(sizeof(cpu_set_t)); \
+if (ncpus > CPU_SETSIZE) { \
+ EPRINTF("UNRESOLVED: Your libc does not support masks with %ld cpus", \
+ ncpus); \
+ exit(UNRESOLVED); \
+}
+#endif
+
+#ifndef CPU_FREE
+#define CPU_FREE(ptr) free(ptr)
+#endif
+
+#ifndef CPU_ALLOC_SIZE
+#define CPU_ALLOC_SIZE(size) sizeof(cpu_set_t)
+#endif
+
+#ifndef CPU_ZERO_S
+#define CPU_ZERO_S(size, mask) CPU_ZERO(mask)
+#endif
+
+#ifndef CPU_SET_S
+#define CPU_SET_S(cpu, size, mask) CPU_SET(cpu, mask)
+#endif
+
struct thread_param {
int index;
volatile int stop;
@@ -52,9 +77,11 @@ struct sample_param {
int priority;
};
-static int cpus;
static volatile int ts_stop;
static volatile double base_time;
+static int ncpus_max, ncpus_online;
+static struct thread_param *tp;
+static int tplen;
static inline
double seconds_read(void)
@@ -141,21 +168,123 @@ static void do_work(unsigned granularity_top, volatile unsigned *progress)
}
}
+static int first_available_cpu(int ncpus_max, size_t mask_size, cpu_set_t *mask)
+{
+ int i;
+
+ for (i = 0; i < ncpus_max; i++) {
+ if (CPU_ISSET_S(i, mask_size, mask))
+ return i;
+ }
+ return -1;
+}
+
+static void setup(struct thread_param *tpbase, int len, pthread_t **threads)
+{
+ cpu_set_t *mask;
+ size_t mask_size;
+ int i, cpu;
+
+ ncpus_max = sysconf(_SC_NPROCESSORS_CONF);
+ ncpus_online = sysconf(_SC_NPROCESSORS_ONLN);
+
+ if (ncpus_online < 2) {
+ EPRINTF("UNRESOLVED: we need at least %d online CPUs, got %d",
+ 2, ncpus_online);
+ exit(UNRESOLVED);
+ }
+
+ tplen = len - 1 + (ncpus_online - 1);
+
+ mask_size = CPU_ALLOC_SIZE(ncpus_max);
+ mask = CPU_ALLOC(ncpus_max);
+ if (mask == NULL) {
+ EPRINTF("UNRESOLVED: failed to allocate a CPU mask");
+ exit(UNRESOLVED);
+ }
+
+ if (sched_getaffinity(0, mask_size, mask)) {
+ EPRINTF("UNRESOLVED: sched_getaffinity: %s", strerror(errno));
+ CPU_FREE(mask);
+ exit(UNRESOLVED);
+ }
+
+ /* This is the CPU where all non-TF threads will be running */
+ cpu = first_available_cpu(ncpus_max, mask_size, mask);
+ if (cpu == -1) {
+ EPRINTF("UNRESOLVED: first_available_cpu failed");
+ CPU_FREE(mask);
+ exit(UNRESOLVED);
+ }
+ CPU_CLR_S(cpu, mask_size, mask);
+
+ tp = calloc(tplen, sizeof(struct thread_param));
+
+ for (i = 0; i < len - 1; i++) {
+ tp[i] = tpbase[i];
+ tp[i].cpu = cpu;
+ }
+
+ /* Each TF thread is bind to its own online CPU */
+ for (i = len - 1; i < tplen; i++) {
+ tp[i] = tpbase[len - 1];
+ tp[i].index = i;
+
+ cpu = first_available_cpu(ncpus_max, mask_size, mask);
+ if (cpu == -1) {
+ EPRINTF("UNRESOLVED: first_available_cpu failed");
+ CPU_FREE(mask);
+ exit(UNRESOLVED);
+ }
+ tp[i].cpu = cpu;
+ CPU_CLR_S(cpu, mask_size, mask);
+ }
+
+ CPU_FREE(mask);
+
+ *threads = calloc(tplen - 1, sizeof(pthread_t));
+ if (*threads == NULL) {
+ EPRINTF("UNRESOLVED: calloc failed");
+ exit(UNRESOLVED);
+ }
+}
+
+static void test_set_affinity(pid_t pid, int cpu)
+{
+ cpu_set_t *mask;
+ size_t mask_size;
+
+ if (cpu >= ncpus_max) {
+ EPRINTF("UNRESOLVED: invalid CPU specified: %d", cpu);
+ exit(UNRESOLVED);
+ }
+
+ mask_size = CPU_ALLOC_SIZE(ncpus_max);
+ mask = CPU_ALLOC(ncpus_max);
+ if (mask == NULL) {
+ EPRINTF("UNRESOLVED: failed to allocate a CPU mask");
+ exit(UNRESOLVED);
+ }
+
+ CPU_ZERO_S(mask_size, mask);
+ CPU_SET_S(cpu, mask_size, mask);
+
+ if (sched_setaffinity(pid, mask_size, mask)) {
+ EPRINTF("UNRESOLVED: pid %d: sched_setaffinity failed: %s",
+ pid, strerror(errno));
+ CPU_FREE(mask);
+ exit(UNRESOLVED);
+ }
+ CPU_FREE(mask);
+}
+
static void *thread_fn(void *param)
{
struct thread_param *tp = param;
struct timespec ts;
int rc;
- unsigned long mask = 1 << tp->cpu;
-#if __linux__
- rc = sched_setaffinity(0, sizeof(mask), &mask);
- if (rc < 0) {
- EPRINTF("UNRESOLVED: Thread %s index %d: Can't set affinity: "
- "%d %s", tp->name, tp->index, rc, strerror(rc));
- exit(UNRESOLVED);
- }
-#endif
+ test_set_affinity(0, tp->cpu);
test_set_priority(pthread_self(), tp->policy, tp->priority);
DPRINTF(stdout, "#EVENT %f %s Thread Started\n",
@@ -186,19 +315,9 @@ static void *thread_tl(void *param)
{
struct tl_param *tlp = param;
struct thread_param *tp = tlp->tp;
- unsigned long mask = 1 << tp->cpu;
pthread_mutex_t **mutex;
- int rc;
-#if __linux__
- rc = sched_setaffinity((pid_t) 0, sizeof(mask), &mask);
- if (rc < 0) {
- EPRINTF
- ("UNRESOLVED: Thread %s index %d: Can't set affinity: %d %s",
- tp->name, tp->index, rc, strerror(rc));
- exit(UNRESOLVED);
- }
-#endif
+ test_set_affinity(0, tp->cpu);
test_set_priority(pthread_self(), tp->policy, tp->priority);
diff --git a/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-1.c b/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-1.c
index 3b4b360..cb0290c 100644
--- a/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-1.c
+++ b/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-1.c
@@ -38,16 +38,11 @@
pthread_mutex_t mutex;
pthread_mutex_t *mutexes[] = { &mutex, NULL };
-struct thread_param tp[] = {
+struct thread_param tpbase[] = {
{
0, 0, 0, 1, SCHED_FIFO, "TL", 0, 0, 0, 0}, {
1, 0, 50, 2, SCHED_FIFO, "TP", 0, 0, 0, 0}, {
- 2, 0, 0, 3, SCHED_FIFO, "TF", 1, 0, 0, 0}, {
- 3, 0, 0, 3, SCHED_FIFO, "TF", 2, 0, 0, 0}, {
- 4, 0, 0, 3, SCHED_FIFO, "TF", 3, 0, 0, 0}, {
- 5, 0, 0, 3, SCHED_FIFO, "TF", 4, 0, 0, 0}, {
- 6, 0, 0, 3, SCHED_FIFO, "TF", 5, 0, 0, 0}, {
- 7, 0, 0, 3, SCHED_FIFO, "TF", 6, 0, 0, 0}
+ 2, 0, 0, 3, SCHED_FIFO, "TF", 1, 0, 0, 0},
};
void *thread_tb(void *arg)
@@ -86,15 +81,17 @@ int main(void)
{
pthread_mutexattr_t mutex_attr;
pthread_attr_t threadattr;
- pthread_t threads[cpus - 1], threadsample, threadtp, threadtl, threadtb;
+ pthread_t *threads;
+ pthread_t threadsample, threadtp, threadtl, threadtb;
struct tl_param tlp;
struct sample_param sp;
int multiplier = 1;
- int i;
- int rc;
+ int i, rc;
test_set_priority(pthread_self(), SCHED_FIFO, 6);
- cpus = sysconf(_SC_NPROCESSORS_ONLN);
+
+ setup(tpbase, 3, &threads);
+
base_time = seconds_read();
/* Initialize a mutex with PTHREAD_PRIO_INHERIT protocol */
@@ -107,7 +104,7 @@ int main(void)
/* Start the sample thread */
DPRINTF(stderr, "Main Thread: start sample thread \n");
sp.tp = tp;
- sp.tplen = 2 + cpus - 1;
+ sp.tplen = tplen;
sp.period = 250;
sp.priority = 5;
rc = pthread_create(&threadsample, &threadattr, thread_sample, &sp);
@@ -117,8 +114,8 @@ int main(void)
}
/* Start the TF threads */
- DPRINTF(stderr, "Main Thread: start %d TF thread\n", cpus - 1);
- for (i = 0; i < cpus - 1; i++) {
+ DPRINTF(stderr, "Main Thread: start %d TF thread\n", tplen - 2);
+ for (i = 0; i < tplen - 2; i++) {
rc = pthread_create(&threads[i], &threadattr, thread_fn,
&tp[i + 2]);
if (rc != 0) {
@@ -173,9 +170,8 @@ int main(void)
/* Stop TF threads */
DPRINTF(stderr, "Main Thread: stop TF threads\n");
- for (i = 2; i < cpus - 1; i++) {
+ for (i = 2; i < tplen; i++)
tp[i].stop = 1;
- }
/* Stop sampler */
ts_stop = 1;
diff --git a/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-2.c b/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-2.c
index 76716f4..a4cea52 100644
--- a/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-2.c
+++ b/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-2.c
@@ -40,17 +40,12 @@
pthread_mutex_t mutex;
pthread_mutex_t *mutexes[] = { &mutex, NULL };
-struct thread_param tp[] = {
+struct thread_param tpbase[] = {
{
0, 0, 0, 1, SCHED_FIFO, "TL", 0, 0, 0, 0}, {
1, 0, 500, 2, SCHED_FIFO, "TP1", 0, 0, 0, 0}, {
2, 0, 500, 5, SCHED_FIFO, "TP2", 0, 0, 0, 0}, {
- 3, 0, 0, 3, SCHED_FIFO, "TF", 1, 0, 0, 0}, {
- 4, 0, 0, 3, SCHED_FIFO, "TF", 2, 0, 0, 0}, {
- 5, 0, 0, 3, SCHED_FIFO, "TF", 3, 0, 0, 0}, {
- 6, 0, 0, 3, SCHED_FIFO, "TF", 4, 0, 0, 0}, {
- 7, 0, 0, 3, SCHED_FIFO, "TF", 5, 0, 0, 0}, {
- 8, 0, 0, 3, SCHED_FIFO, "TF", 6, 0, 0, 0}
+ 3, 0, 0, 3, SCHED_FIFO, "TF", 1, 0, 0, 0}
};
void *thread_tb1(void *arg)
@@ -114,16 +109,17 @@ int main(void)
{
pthread_mutexattr_t mutex_attr;
pthread_attr_t threadattr;
- pthread_t threads[cpus - 1];
+ pthread_t *threads;
pthread_t threadsample, threadtp, threadtl, threadtb1, threadtb2;
struct tl_param tlp;
struct sample_param sp;
time_t multiplier = 1;
- int i;
- int rc;
+ int i, rc;
test_set_priority(pthread_self(), SCHED_FIFO, 8);
- cpus = sysconf(_SC_NPROCESSORS_ONLN);
+
+ setup(tpbase, 4, &threads);
+
base_time = seconds_read();
/* Initialize a mutex with PTHREAD_PRIO_INHERIT protocol */
@@ -136,7 +132,7 @@ int main(void)
/* Start the sample thread */
DPRINTF(stderr, "Main Thread: Creating sample thread \n");
sp.tp = tp;
- sp.tplen = 3 + cpus - 1;
+ sp.tplen = tplen;
sp.period = 300;
sp.priority = 7;
rc = pthread_create(&threadsample, &threadattr, thread_sample, &sp);
@@ -146,8 +142,8 @@ int main(void)
}
/* Start the TF threads */
- DPRINTF(stderr, "Main Thread: Creating %d TF threads \n", cpus - 1);
- for (i = 0; i < cpus - 1; i++) {
+ DPRINTF(stderr, "Main Thread: Creating %d TF threads\n", tplen - 3);
+ for (i = 0; i < tplen - 3; i++) {
rc = pthread_create(&threads[i], &threadattr, thread_fn,
&tp[i + 3]);
if (rc != 0) {
@@ -210,9 +206,8 @@ int main(void)
sleep(base_time + multiplier * 120 - seconds_read());
/* Stop TF threads */
- for (i = 2; i < cpus - 1; i++) {
+ for (i = 3; i < tplen; i++)
tp[i].stop = 1;
- }
/* Stop sampler */
ts_stop = 1;
diff --git a/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-3.c b/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-3.c
index 17cc43d..aa44c55 100644
--- a/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-3.c
+++ b/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-3.c
@@ -41,17 +41,12 @@ pthread_mutex_t mutex1;
pthread_mutex_t mutex2;
pthread_mutex_t *mutexes[] = { &mutex1, &mutex2, NULL };
-struct thread_param tp[] = {
+struct thread_param tpbase[] = {
{
0, 0, 0, 1, SCHED_FIFO, "TL", 0, 0, 0, 0}, {
1, 0, 500, 2, SCHED_FIFO, "TP1", 0, 0, 0, 0}, {
1, 0, 500, 5, SCHED_FIFO, "TP2", 0, 0, 0, 0}, {
- 2, 0, 0, 3, SCHED_FIFO, "TF", 1, 0, 0, 0}, {
- 3, 0, 0, 3, SCHED_FIFO, "TF", 2, 0, 0, 0}, {
- 4, 0, 0, 3, SCHED_FIFO, "TF", 3, 0, 0, 0}, {
- 5, 0, 0, 3, SCHED_FIFO, "TF", 4, 0, 0, 0}, {
- 6, 0, 0, 3, SCHED_FIFO, "TF", 5, 0, 0, 0}, {
- 7, 0, 0, 3, SCHED_FIFO, "TF", 6, 0, 0, 0}
+ 2, 0, 0, 3, SCHED_FIFO, "TF", 1, 0, 0, 0}
};
void *thread_tb1(void *arg)
@@ -115,17 +110,18 @@ int main(void)
{
pthread_mutexattr_t mutex_attr;
pthread_attr_t threadattr;
- pthread_t threads[cpus - 1];
+ pthread_t *threads;
pthread_t threadsample, threadtp, threadtl, threadtb1, threadtb2;
struct tl_param tlp;
struct sample_param sp;
time_t multiplier = 1;
- int i;
- int rc;
+ int i, rc;
test_set_priority(pthread_self(), SCHED_FIFO, 8);
+
+ setup(tpbase, 4, &threads);
+
base_time = seconds_read();
- cpus = sysconf(_SC_NPROCESSORS_ONLN);
/* Initialize mutex1, mutex2 with PTHREAD_PRIO_INHERIT protocol */
mutex_attr_init(&mutex_attr);
@@ -138,7 +134,7 @@ int main(void)
/* Start the sample thread */
DPRINTF(stderr, "Main Thread: Creating sample thread\n");
sp.tp = tp;
- sp.tplen = 3 + cpus - 1;
+ sp.tplen = tplen;
sp.period = 300;
sp.priority = 7;
rc = pthread_create(&threadsample, &threadattr, thread_sample, &sp);
@@ -148,8 +144,8 @@ int main(void)
}
/* Start the TF threads */
- DPRINTF(stderr, "Main Thread: Creating %d TF threads\n", cpus - 1);
- for (i = 0; i < cpus - 1; i++) {
+ DPRINTF(stderr, "Main Thread: Creating %d TF threads\n", tplen - 3);
+ for (i = 0; i < tplen - 3; i++) {
rc = pthread_create(&threads[i], &threadattr, thread_fn,
&tp[i + 3]);
if (rc != 0) {
@@ -212,9 +208,8 @@ int main(void)
sleep(base_time + multiplier * 120 - seconds_read());
/* Stop TF threads */
- for (i = 2; i < cpus - 1; i++) {
+ for (i = 3; i < tplen; i++)
tp[i].stop = 1;
- }
/* Stop sampler */
ts_stop = 1;
diff --git a/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-4.c b/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-4.c
index 84f9878..4e8cbed 100644
--- a/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-4.c
+++ b/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-4.c
@@ -41,16 +41,11 @@
pthread_mutex_t mutex1;
pthread_mutex_t mutex2;
-struct thread_param tp[] = {
+struct thread_param tpbase[] = {
{
0, 0, 0, 1, SCHED_FIFO, "TL", 0, 0, 0, 0}, {
1, 0, 100, 4, SCHED_FIFO, "TP", 0, 0, 0, 0}, {
- 2, 0, 0, 2, SCHED_FIFO, "TF", 1, 0, 0, 0}, {
- 3, 0, 0, 2, SCHED_FIFO, "TF", 2, 0, 0, 0}, {
- 4, 0, 0, 2, SCHED_FIFO, "TF", 3, 0, 0, 0}, {
- 5, 0, 0, 2, SCHED_FIFO, "TF", 4, 0, 0, 0}, {
- 6, 0, 0, 2, SCHED_FIFO, "TF", 5, 0, 0, 0}, {
- 7, 0, 0, 2, SCHED_FIFO, "TF", 6, 0, 0, 0}
+ 2, 0, 0, 2, SCHED_FIFO, "TF", 1, 0, 0, 0}
};
void *thread_fn4(void *param)
@@ -58,16 +53,8 @@ void *thread_fn4(void *param)
struct thread_param *tp = param;
struct timespec ts;
int rc;
- unsigned long mask = 1 << tp->cpu;
-#if __linux__
- rc = sched_setaffinity(0, sizeof(mask), &mask);
- if (rc < 0) {
- EPRINTF("UNRESOLVED: Thread %s index %d: Can't set affinity: "
- "%d %s", tp->name, tp->index, rc, strerror(rc));
- exit(UNRESOLVED);
- }
-#endif
+ test_set_affinity(0, tp->cpu);
test_set_priority(pthread_self(), tp->policy, tp->priority);
DPRINTF(stdout, "#EVENT %f Thread %s Started\n",
@@ -163,16 +150,17 @@ int main(void)
{
pthread_mutexattr_t mutex_attr;
pthread_attr_t threadattr;
- pthread_t threads[cpus - 1];
+ pthread_t *threads;
pthread_t threadsample, threadtp, threadtl, threadtb1, threadtb2;
struct sample_param sp;
time_t multiplier = 1;
- int i;
- int rc;
+ int i, rc;
test_set_priority(pthread_self(), SCHED_FIFO, 8);
+
+ setup(tpbase, 3, &threads);
+
base_time = seconds_read();
- cpus = sysconf(_SC_NPROCESSORS_ONLN);
/* Initialize mutex1, mutex2 with PTHREAD_PRIO_INHERIT protocol */
mutex_attr_init(&mutex_attr);
@@ -185,7 +173,7 @@ int main(void)
/* Start the sample thread */
DPRINTF(stderr, "Main Thread: Creating sample thread\n");
sp.tp = tp;
- sp.tplen = 2 + cpus - 1;
+ sp.tplen = tplen;
sp.period = 300;
sp.priority = 6;
rc = pthread_create(&threadsample, &threadattr, thread_sample, &sp);
@@ -195,8 +183,8 @@ int main(void)
}
/* Start the TF threads */
- DPRINTF(stderr, "Main Thread: Creating %d TF threads\n", cpus - 1);
- for (i = 0; i < cpus - 1; i++) {
+ DPRINTF(stderr, "Main Thread: Creating %d TF threads\n", tplen - 2);
+ for (i = 0; i < tplen - 2; i++) {
rc = pthread_create(&threads[i], &threadattr, thread_fn4,
&tp[i + 2]);
if (rc != 0) {
@@ -252,9 +240,8 @@ int main(void)
sleep(base_time + multiplier * 95 - seconds_read());
/* Stop TF threads */
- for (i = 2; i < cpus - 1; i++) {
+ for (i = 2; i < tplen; i++)
tp[i].stop = 1;
- }
/* Stop sampler */
ts_stop = 1;
diff --git a/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-5.c b/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-5.c
index 3ba3a94..4966ad9 100644
--- a/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-5.c
+++ b/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-5.c
@@ -39,34 +39,20 @@
pthread_mutex_t mutex;
volatile int unlock_mutex = 0;
-struct thread_param tp[] = {
+struct thread_param tpbase[] = {
{
0, 0, 0, 1, SCHED_FIFO, "TL", 0, 0, 0, 0}, {
1, 0, 200, 2, SCHED_FIFO, "TP", 0, 0, 0, 0}, {
- 2, 0, 0, 3, SCHED_FIFO, "TF", 1, 0, 0, 0}, {
- 3, 0, 0, 3, SCHED_FIFO, "TF", 2, 0, 0, 0}, {
- 4, 0, 0, 3, SCHED_FIFO, "TF", 3, 0, 0, 0}, {
- 5, 0, 0, 3, SCHED_FIFO, "TF", 4, 0, 0, 0}, {
- 6, 0, 0, 3, SCHED_FIFO, "TF", 5, 0, 0, 0}, {
- 7, 0, 0, 3, SCHED_FIFO, "TF", 6, 0, 0, 0}
+ 2, 0, 0, 3, SCHED_FIFO, "TF", 1, 0, 0, 0}
};
void *thread_tl5(void *param)
{
struct thread_param *tp = param;
- unsigned long mask = 1 << tp->cpu;
int rc;
test_set_priority(pthread_self(), tp->policy, tp->priority);
-#if __linux__
- rc = sched_setaffinity((pid_t) 0, sizeof(mask), &mask);
- if (rc < 0) {
- EPRINTF
- ("UNRESOLVED: Thread %s index %d: Can't set affinity: %d %s",
- tp->name, tp->index, rc, strerror(rc));
- exit(UNRESOLVED);
- }
-#endif
+ test_set_affinity(0, tp->cpu);
DPRINTF(stdout, "#EVENT %f Thread TL started\n",
seconds_read() - base_time);
@@ -137,15 +123,17 @@ int main(void)
{
pthread_mutexattr_t mutex_attr;
pthread_attr_t threadattr;
- pthread_t threads[cpus - 1], threadsample, threadtp, threadtl, threadtb;
+ pthread_t *threads;
+ pthread_t threadsample, threadtp, threadtl, threadtb;
struct sample_param sp;
time_t multiplier = 1;
- int i;
- int rc;
+ int i, rc;
test_set_priority(pthread_self(), SCHED_FIFO, 6);
+
+ setup(tpbase, 3, &threads);
+
base_time = seconds_read();
- cpus = sysconf(_SC_NPROCESSORS_ONLN);
/* Initialize a mutex with PTHREAD_PRIO_INHERIT protocol */
mutex_attr_init(&mutex_attr);
@@ -157,7 +145,7 @@ int main(void)
/* Start the sample thread */
DPRINTF(stderr, "Main Thread: Creating sample thread\n");
sp.tp = tp;
- sp.tplen = 2 + cpus - 1;
+ sp.tplen = tplen;
sp.period = 300;
sp.priority = 5;
rc = pthread_create(&threadsample, &threadattr, thread_sample, &sp);
@@ -166,8 +154,8 @@ int main(void)
exit(UNRESOLVED);
}
/* Start the TF threads */
- DPRINTF(stderr, "Main Thread: Creating %d TF threads\n", cpus - 1);
- for (i = 0; i < cpus - 1; i++) {
+ DPRINTF(stderr, "Main Thread: Creating %d TF threads\n", tplen - 2);
+ for (i = 0; i < tplen - 2; i++) {
rc = pthread_create(&threads[i], &threadattr, thread_fn,
&tp[i + 2]);
if (rc != 0) {
@@ -216,9 +204,8 @@ int main(void)
sleep(base_time + multiplier * 70 - seconds_read());
/* Stop TF threads */
- for (i = 2; i < cpus - 1; i++) {
+ for (i = 2; i < tplen; i++)
tp[i].stop = 1;
- }
/* Stop sampler */
ts_stop = 1;
diff --git a/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-6.c b/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-6.c
index 46b36f7..44936c5 100644
--- a/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-6.c
+++ b/testcases/open_posix_testsuite/functional/threads/pi_test/pitest-6.c
@@ -38,16 +38,11 @@
pthread_mutex_t mutex;
pthread_mutex_t *mutexes[] = { &mutex, NULL };
-struct thread_param tp[] = {
+struct thread_param tpbase[] = {
{
0, 0, 0, 1, SCHED_FIFO, "TL", 0, 0, 0, 0}, {
1, 0, 200, 2, SCHED_FIFO, "TP", 0, 0, 0, 0}, {
- 2, 0, 0, 3, SCHED_FIFO, "TF", 1, 0, 0, 0}, {
- 3, 0, 0, 3, SCHED_FIFO, "TF", 2, 0, 0, 0}, {
- 4, 0, 0, 3, SCHED_FIFO, "TF", 3, 0, 0, 0}, {
- 5, 0, 0, 3, SCHED_FIFO, "TF", 4, 0, 0, 0}, {
- 6, 0, 0, 3, SCHED_FIFO, "TF", 5, 0, 0, 0}, {
- 7, 0, 0, 3, SCHED_FIFO, "TF", 6, 0, 0, 0}
+ 2, 0, 0, 3, SCHED_FIFO, "TF", 1, 0, 0, 0}
};
void *thread_tb(void *arg)
@@ -83,19 +78,20 @@ void *thread_tb(void *arg)
int main(void)
{
- cpus = sysconf(_SC_NPROCESSORS_ONLN);
pthread_mutexattr_t mutex_attr;
pthread_attr_t threadattr;
- pthread_t threads[cpus - 1], threadsample, threadtp, threadtl, threadtb;
+ pthread_t *threads;
+ pthread_t threadsample, threadtp, threadtl, threadtb;
struct tl_param tlp;
struct sample_param sp;
time_t multiplier = 1;
- int i;
- int rc;
+ int i, rc;
test_set_priority(pthread_self(), SCHED_FIFO, 6);
+
+ setup(tpbase, 3, &threads);
+
base_time = seconds_read();
- cpus = sysconf(_SC_NPROCESSORS_ONLN);
/* Initialize a mutex with PTHREAD_PRIO_INHERIT protocol */
mutex_attr_init(&mutex_attr);
@@ -107,7 +103,7 @@ int main(void)
/* Start the sample thread */
DPRINTF(stderr, "Main Thread: Creating sample thread\n");
sp.tp = tp;
- sp.tplen = 2 + cpus - 1;
+ sp.tplen = tplen;
sp.period = 250;
sp.priority = 5;
rc = pthread_create(&threadsample, &threadattr, thread_sample, &sp);
@@ -117,8 +113,8 @@ int main(void)
}
/* Start the TF threads */
- DPRINTF(stderr, "Main Thread: Creating %d TF threads\n", cpus - 1);
- for (i = 0; i < cpus - 1; i++) {
+ DPRINTF(stderr, "Main Thread: Creating %d TF threads\n", tplen - 2);
+ for (i = 0; i < tplen - 2; i++) {
rc = pthread_create(&threads[i], &threadattr, thread_fn,
&tp[i + 2]);
if (rc != 0) {
@@ -175,9 +171,8 @@ int main(void)
sleep(base_time + multiplier * 80 - seconds_read());
/* Stop TF threads */
- for (i = 2; i < cpus - 1; i++) {
+ for (i = 2; i < tplen; i++)
tp[i].stop = 1;
- }
/* Stop sampler */
ts_stop = 1;
--
1.7.1
More information about the Ltp
mailing list