diff options
author | Jennifer Averett <jennifer.averett@oarcorp.com> | 2014-03-07 09:06:57 -0600 |
---|---|---|
committer | Jennifer Averett <jennifer.averett@oarcorp.com> | 2014-03-07 09:15:15 -0600 |
commit | 5c3323492ecd894753efa5abed433655a8181c83 (patch) | |
tree | f2b6145882a261e35a6e9b4198235e3db0895c70 /testsuites/smptests | |
parent | smptests: Add smppsxaffinity02. (diff) | |
download | rtems-5c3323492ecd894753efa5abed433655a8181c83.tar.bz2 |
Remove trailing whitespace in previous patches
Diffstat (limited to 'testsuites/smptests')
-rw-r--r-- | testsuites/smptests/Makefile.am | 2 | ||||
-rw-r--r-- | testsuites/smptests/smpaffinity01/init.c | 36 | ||||
-rw-r--r-- | testsuites/smptests/smppsxaffinity01/init.c | 14 | ||||
-rw-r--r-- | testsuites/smptests/smppsxaffinity01/smppsxaffinity01.doc | 2 | ||||
-rw-r--r-- | testsuites/smptests/smppsxaffinity02/init.c | 34 | ||||
-rw-r--r-- | testsuites/smptests/smppsxaffinity02/smppsxaffinity02.doc | 2 |
6 files changed, 45 insertions, 45 deletions
diff --git a/testsuites/smptests/Makefile.am b/testsuites/smptests/Makefile.am index ca99c1e83e..1f4b0b3f0d 100644 --- a/testsuites/smptests/Makefile.am +++ b/testsuites/smptests/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I ../aclocal -SUBDIRS = +SUBDIRS = if SMPTESTS SUBDIRS += smp01 diff --git a/testsuites/smptests/smpaffinity01/init.c b/testsuites/smptests/smpaffinity01/init.c index c7ccf7e748..e4665caa8e 100644 --- a/testsuites/smptests/smpaffinity01/init.c +++ b/testsuites/smptests/smpaffinity01/init.c @@ -41,13 +41,13 @@ void Validate_setaffinity_errors(void) /* Note this check assumes you are running with less than 32 CPUs */ CPU_FILL(&cpuset); puts( "Init - rtems_task_set_affinity - Invalid cpu - RTEMS_INVALID_NUMBER" ); - sc = rtems_task_set_affinity( Init_id, sizeof(cpu_set_t), &cpuset ); + sc = rtems_task_set_affinity( Init_id, sizeof(cpu_set_t), &cpuset ); rtems_test_assert( sc == RTEMS_INVALID_NUMBER ); - + /* Verify rtems_task_set_affinity checks that at least one cpu is set */ CPU_ZERO(&cpuset); puts( "Init - rtems_task_set_affinity - no cpu - RTEMS_INVALID_NUMBER" ); - sc = rtems_task_set_affinity( Init_id, sizeof(cpu_set_t), &cpuset ); + sc = rtems_task_set_affinity( Init_id, sizeof(cpu_set_t), &cpuset ); rtems_test_assert( sc == RTEMS_INVALID_NUMBER ); /* Verify rtems_task_set_affinity checks that at thread id is valid */ @@ -55,7 +55,7 @@ void Validate_setaffinity_errors(void) puts( "Init - rtems_task_set_affinity - Invalid thread - RTEMS_INVALID_ID" ); sc = rtems_task_set_affinity( 999, sizeof(cpu_set_t), &cpuset ); rtems_test_assert( sc == RTEMS_INVALID_ID ); - + /* Verify rtems_task_set_affinity validates cpusetsize */ puts( "Init - rtems_task_set_affinity - Invalid cpusetsize - RTEMS_INVALID_NUMBER" ); sc = rtems_task_set_affinity( Init_id, sizeof(cpu_set_t) * 2, &cpuset ); @@ -67,7 +67,7 @@ void Validate_setaffinity_errors(void) rtems_test_assert( sc == RTEMS_INVALID_ADDRESS ); } -void Validate_getaffinity_errors(void) +void Validate_getaffinity_errors(void) { int sc; cpu_set_t cpuset; @@ -77,9 +77,9 @@ void Validate_getaffinity_errors(void) puts( "Init - rtems_task_get_affinity - Invalid thread - RTEMS_INVALID_ID" ); sc = rtems_task_get_affinity( 999, sizeof(cpu_set_t), &cpuset ); rtems_test_assert( sc == RTEMS_INVALID_ID ); - + /* Verify rtems_task_get_affinity validates cpusetsize */ - puts( + puts( "Init - rtems_task_get_affinity - Invalid cpusetsize - RTEMS_INVALID_NUMBER" ); sc = rtems_task_get_affinity( Init_id, sizeof(cpu_set_t) * 2, &cpuset ); @@ -98,18 +98,18 @@ void Validate_affinity(void ) cpu_set_t cpuset2; uint32_t i; int sc; - int cpu_count; + int cpu_count; rtems_task_priority priority; char ch[2]; - - + + puts( "Init - Set Init priority to high"); sc = rtems_task_set_priority( Init_id, 1, &priority ); directive_failed( sc, "Set Init Priority" ); sc = rtems_task_get_affinity( Init_id, sizeof(cpu_set_t), &cpuset0 ); directive_failed( sc, "Get Affinity of Init Task" ); - + /* Get the number of processors that we are using. */ cpu_count = rtems_smp_get_processor_count(); @@ -129,14 +129,14 @@ void Validate_affinity(void ) sc = rtems_task_start( Med_id[i], Task_1, i+1 ); directive_failed( sc, "task start" ); - + sc = rtems_task_get_affinity( Med_id[i], sizeof(cpu_set_t), &cpuset2 ); directive_failed( sc, "Get Affinity of Medium Priority Task" ); rtems_test_assert( CPU_EQUAL(&cpuset0, &cpuset2) ); } - /* - * Create low priority thread for each remaining cpu with the affinity + /* + * Create low priority thread for each remaining cpu with the affinity * set to only run on one cpu. */ puts( "Init - Create Low priority tasks"); @@ -190,7 +190,7 @@ void Validate_affinity(void ) directive_failed( sc, "Low priority task set affinity" ); } - + puts("Init - Validate affinity on Low priority tasks"); CPU_COPY(&cpuset1, &cpuset0); for (i=0; i<cpu_count; i++){ @@ -211,14 +211,14 @@ static void Init(rtems_task_argument arg) puts( "\n\n*** SMP AFFINITY 1 ***" ); - /* Initialize thread id */ + /* Initialize thread id */ sc = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &Init_id ); directive_failed( sc, "Identify Init Task" ); - + Validate_setaffinity_errors(); Validate_getaffinity_errors(); Validate_affinity(); - + puts( "*** END OF SMP AFFINITY TEST 1 ***" ); rtems_test_exit(0); } diff --git a/testsuites/smptests/smppsxaffinity01/init.c b/testsuites/smptests/smppsxaffinity01/init.c index 525b5f7d3c..51ce9a2c08 100644 --- a/testsuites/smptests/smppsxaffinity01/init.c +++ b/testsuites/smptests/smppsxaffinity01/init.c @@ -30,7 +30,7 @@ void Validate_attrgetaffinity_errors(void); void Validate_attrsetaffinity_errors(void); void Validate_attr(void); -void Validate_attrgetaffinity_errors(void) +void Validate_attrgetaffinity_errors(void) { int sc; cpu_set_t cpuset; @@ -53,7 +53,7 @@ void Validate_attrgetaffinity_errors(void) } -void Validate_attrsetaffinity_errors(void) +void Validate_attrsetaffinity_errors(void) { int sc; cpu_set_t cpuset; @@ -105,11 +105,11 @@ void Validate_attr(void ) cpus = rtems_smp_get_processor_count(); - puts( + puts( "Init - Validate pthread_attr_setaffinity_np and " "pthread_attr_getaffinity_np" ); - + /* Set each cpu seperately in the affinity set */ for ( i=0; i<cpus; i++ ){ CPU_ZERO(&cpuset1); @@ -120,7 +120,7 @@ void Validate_attr(void ) sc = pthread_attr_getaffinity_np( &attr, sizeof(cpu_set_t), &cpuset2 ); rtems_test_assert( sc == 0 ); - + rtems_test_assert( CPU_EQUAL(&cpuset1, &cpuset2) ); } } @@ -131,13 +131,13 @@ void *POSIX_Init( { puts( "\n\n*** SMP POSIX AFFINITY ATTRIBUTE TEST 1 ***" ); - /* Initialize thread id */ + /* Initialize thread id */ Init_id = pthread_self(); Validate_attrsetaffinity_errors(); Validate_attrgetaffinity_errors(); Validate_attr(); - + puts( "*** END OF SMP POSIX AFFINITY ATTRIBUTE TEST 1 ***" ); rtems_test_exit(0); } diff --git a/testsuites/smptests/smppsxaffinity01/smppsxaffinity01.doc b/testsuites/smptests/smppsxaffinity01/smppsxaffinity01.doc index b6333c40e4..6072c2db35 100644 --- a/testsuites/smptests/smppsxaffinity01/smppsxaffinity01.doc +++ b/testsuites/smptests/smppsxaffinity01/smppsxaffinity01.doc @@ -14,7 +14,7 @@ directives: pthread_attr_getaffinity_np pthread_attr_setaffinity_np - + concepts: + Verify error conditions and functionality of pthread_attr_getaffinity_np diff --git a/testsuites/smptests/smppsxaffinity02/init.c b/testsuites/smptests/smppsxaffinity02/init.c index 03723e14eb..c2ebb93489 100644 --- a/testsuites/smptests/smppsxaffinity02/init.c +++ b/testsuites/smptests/smppsxaffinity02/init.c @@ -46,13 +46,13 @@ void Validate_setaffinity_errors(void) /* Verify pthread_setaffinity_np checks that all cpu's exist. */ CPU_FILL(&cpuset); puts( "Init - pthread_setaffinity_np - Invalid cpu - EINVAL" ); - sc = pthread_setaffinity_np( Init_id, sizeof(cpu_set_t), &cpuset ); + sc = pthread_setaffinity_np( Init_id, sizeof(cpu_set_t), &cpuset ); rtems_test_assert( sc == EINVAL ); - + /* Verify pthread_setaffinity_np checks that at least one cpu is set */ CPU_ZERO(&cpuset); puts( "Init - pthread_setaffinity_np - no cpu - EINVAL" ); - sc = pthread_setaffinity_np( Init_id, sizeof(cpu_set_t), &cpuset ); + sc = pthread_setaffinity_np( Init_id, sizeof(cpu_set_t), &cpuset ); rtems_test_assert( sc == EINVAL ); /* Verify pthread_setaffinity_np checks that at thread id is valid */ @@ -60,7 +60,7 @@ void Validate_setaffinity_errors(void) puts( "Init - pthread_setaffinity_np - Invalid thread - ESRCH" ); sc = pthread_setaffinity_np( 999, sizeof(cpu_set_t), &cpuset ); rtems_test_assert( sc == ESRCH ); - + /* Verify pthread_setaffinity_np validates cpusetsize */ puts( "Init - pthread_setaffinity_np - Invalid cpusetsize - EINVAL" ); sc = pthread_setaffinity_np( Init_id, sizeof(cpu_set_t) * 2, &cpuset ); @@ -72,7 +72,7 @@ void Validate_setaffinity_errors(void) rtems_test_assert( sc == EFAULT ); } -void Validate_getaffinity_errors(void) +void Validate_getaffinity_errors(void) { int sc; cpu_set_t cpuset; @@ -82,7 +82,7 @@ void Validate_getaffinity_errors(void) puts( "Init - pthread_getaffinity_np - Invalid thread - ESRCH" ); sc = pthread_getaffinity_np( 999, sizeof(cpu_set_t), &cpuset ); rtems_test_assert( sc == ESRCH ); - + /* 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 ); @@ -102,10 +102,10 @@ void Validate_affinity(void ) cpu_set_t cpuset2; uint32_t i; int sc; - int cpu_count; + int cpu_count; struct sched_param param; - - + + puts( "Init - Set Init priority to high"); sc = pthread_getattr_np( Init_id, &attr ); rtems_test_assert( sc == 0 ); @@ -117,7 +117,7 @@ void Validate_affinity(void ) sc = pthread_getaffinity_np( Init_id, sizeof(cpu_set_t), &cpuset0 ); rtems_test_assert( !sc ); - + /* Get the number of processors that we are using. */ cpu_count = rtems_smp_get_processor_count(); @@ -135,8 +135,8 @@ void Validate_affinity(void ) rtems_test_assert( CPU_EQUAL(&cpuset0, &cpuset2) ); } - /* - * Create low priority thread for each remaining cpu with the affinity + /* + * Create low priority thread for each remaining cpu with the affinity * set to only run on one cpu. */ puts( "Init - Create Low priority tasks"); @@ -177,7 +177,7 @@ void Validate_affinity(void ) } rtems_test_assert( !sc ); } - + puts("Init - Validate affinity on Low priority tasks"); CPU_COPY(&cpuset1, &cpuset0); for (i=0; i<cpu_count; i++){ @@ -198,13 +198,13 @@ void *POSIX_Init( { puts( "\n\n*** SMP POSIX AFFINITY ATTRIBUTE TEST 2 ***" ); - /* Initialize thread id */ + /* Initialize thread id */ Init_id = pthread_self(); - + Validate_setaffinity_errors(); Validate_getaffinity_errors(); Validate_affinity(); - + puts( "*** SMP POSIX AFFINITY ATTRIBUTE TEST 2 ***" ); rtems_test_exit(0); } @@ -230,7 +230,7 @@ void *POSIX_Init( #define CONFIGURE_SMP_MAXIMUM_PROCESSORS NUM_CPUS -#define CONFIGURE_MAXIMUM_POSIX_THREADS (NUM_CPUS*2) +#define CONFIGURE_MAXIMUM_POSIX_THREADS (NUM_CPUS*2) #define CONFIGURE_POSIX_INIT_THREAD_TABLE diff --git a/testsuites/smptests/smppsxaffinity02/smppsxaffinity02.doc b/testsuites/smptests/smppsxaffinity02/smppsxaffinity02.doc index ca735fca5d..b0b1073a47 100644 --- a/testsuites/smptests/smppsxaffinity02/smppsxaffinity02.doc +++ b/testsuites/smptests/smppsxaffinity02/smppsxaffinity02.doc @@ -16,7 +16,7 @@ directives: pthread_getaffinity_np pthread_setaffinity_np - + concepts: + Verify error conditions and functionality of pthread_getaffinity_np |