diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-07-03 14:05:26 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-07-07 07:28:29 +0200 |
| commit | 78515554fd110c9636c38501b699a5da125a5496 (patch) | |
| tree | 527f8f413668a43a76697dca3e994691bddcaa22 /testsuites | |
| parent | score: Add some processor mask functions (diff) | |
| download | rtems-78515554fd110c9636c38501b699a5da125a5496.tar.bz2 | |
score: Move processor affinity to Thread_Control
Update #3059.
Diffstat (limited to 'testsuites')
| -rw-r--r-- | testsuites/smptests/smpaffinity01/init.c | 2 | ||||
| -rw-r--r-- | testsuites/smptests/smppsxaffinity02/init.c | 2 | ||||
| -rw-r--r-- | testsuites/smptests/smpscheduler02/init.c | 19 |
3 files changed, 16 insertions, 7 deletions
diff --git a/testsuites/smptests/smpaffinity01/init.c b/testsuites/smptests/smpaffinity01/init.c index cf95fc54d1..be68e1bbfd 100644 --- a/testsuites/smptests/smpaffinity01/init.c +++ b/testsuites/smptests/smpaffinity01/init.c @@ -84,7 +84,7 @@ void Validate_getaffinity_errors(void) puts( "Init - rtems_task_get_affinity - Invalid cpusetsize - RTEMS_INVALID_NUMBER" ); - sc = rtems_task_get_affinity( Init_id, sizeof(cpu_set_t) * 2, &cpuset ); + sc = rtems_task_get_affinity( Init_id, 1, &cpuset ); rtems_test_assert( sc == RTEMS_INVALID_NUMBER ); /* Verify rtems_task_get_affinity validates cpuset */ diff --git a/testsuites/smptests/smppsxaffinity02/init.c b/testsuites/smptests/smppsxaffinity02/init.c index 462462f275..5f8abac0a0 100644 --- a/testsuites/smptests/smppsxaffinity02/init.c +++ b/testsuites/smptests/smppsxaffinity02/init.c @@ -89,7 +89,7 @@ void Validate_getaffinity_errors(void) /* Verify pthread_getaffinity_np validates cpusetsize */ puts( "Init - pthread_getaffinity_np - Invalid cpusetsize - EINVAL" ); - sc = pthread_getaffinity_np( Init_id, sizeof(cpu_set_t) * 2, &cpuset ); + sc = pthread_getaffinity_np( Init_id, 1, &cpuset ); rtems_test_assert( sc == EINVAL ); /* Verify pthread_getaffinity_np validates cpuset */ diff --git a/testsuites/smptests/smpscheduler02/init.c b/testsuites/smptests/smpscheduler02/init.c index 43558579ab..db7d863991 100644 --- a/testsuites/smptests/smpscheduler02/init.c +++ b/testsuites/smptests/smpscheduler02/init.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2016 embedded brains GmbH. All rights reserved. + * Copyright (c) 2014, 2017 embedded brains GmbH. All rights reserved. * * embedded brains GmbH * Dornierstr. 4 @@ -207,8 +207,14 @@ static void test(void) cpu_set_t first_cpu; cpu_set_t second_cpu; cpu_set_t all_cpus; + cpu_set_t online_cpus; uint32_t cpu_count; + cpu_count = rtems_get_processor_count(); + rtems_test_assert(cpu_count == 1 || cpu_count == 2); + + rtems_test_assert(rtems_get_current_processor() == 0); + main_task_id = rtems_task_self(); CPU_ZERO(&first_cpu); @@ -221,9 +227,12 @@ static void test(void) CPU_SET(0, &all_cpus); CPU_SET(1, &all_cpus); - cpu_count = rtems_get_processor_count(); + CPU_ZERO(&online_cpus); + CPU_SET(0, &online_cpus); - rtems_test_assert(rtems_get_current_processor() == 0); + if (cpu_count > 1) { + CPU_SET(1, &online_cpus); + } sc = rtems_scheduler_ident(SCHED_A, &scheduler_a_id); rtems_test_assert(sc == RTEMS_SUCCESSFUL); @@ -304,7 +313,7 @@ static void test(void) CPU_ZERO(&cpuset); sc = rtems_task_get_affinity(task_id, sizeof(cpuset), &cpuset); rtems_test_assert(sc == RTEMS_SUCCESSFUL); - rtems_test_assert(CPU_EQUAL(&cpuset, &first_cpu)); + rtems_test_assert(CPU_EQUAL(&cpuset, &online_cpus)); rtems_test_assert(sched_get_priority_min(SCHED_RR) == 1); rtems_test_assert(sched_get_priority_max(SCHED_RR) == 254); @@ -326,7 +335,7 @@ static void test(void) CPU_ZERO(&cpuset); sc = rtems_task_get_affinity(task_id, sizeof(cpuset), &cpuset); rtems_test_assert(sc == RTEMS_SUCCESSFUL); - rtems_test_assert(CPU_EQUAL(&cpuset, &second_cpu)); + rtems_test_assert(CPU_EQUAL(&cpuset, &online_cpus)); sc = rtems_task_set_affinity(task_id, sizeof(all_cpus), &all_cpus); rtems_test_assert(sc == RTEMS_SUCCESSFUL); |