From 1c2ab39caf3207f21d667f79783953609190d6dd Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 21 Jul 2011 13:46:49 +0000 Subject: [PATCH] 2011-07-21 Joel Sherrill * psxtmmutex02/init.c, psxtmmutex05/init.c, psxtmmutex06/init.c, psxtmnanosleep02/init.c, psxtmsleep02/init.c, psxtmthread01/init.c, psxtmthread03/init.c: Standardize start and end test messages. --- testsuites/psxtmtests/ChangeLog | 6 ++++++ testsuites/psxtmtests/psxtmmutex02/init.c | 6 +++--- testsuites/psxtmtests/psxtmmutex05/init.c | 6 +++--- testsuites/psxtmtests/psxtmmutex06/init.c | 6 +++--- testsuites/psxtmtests/psxtmnanosleep02/init.c | 4 ++-- testsuites/psxtmtests/psxtmsleep02/init.c | 4 ++-- testsuites/psxtmtests/psxtmthread01/init.c | 4 ++-- testsuites/psxtmtests/psxtmthread03/init.c | 4 ++-- 8 files changed, 23 insertions(+), 17 deletions(-) diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog index e1c646f07b..5aafc0ba29 100644 --- a/testsuites/psxtmtests/ChangeLog +++ b/testsuites/psxtmtests/ChangeLog @@ -1,3 +1,9 @@ +2011-07-21 Joel Sherrill + + * psxtmmutex02/init.c, psxtmmutex05/init.c, psxtmmutex06/init.c, + psxtmnanosleep02/init.c, psxtmsleep02/init.c, psxtmthread01/init.c, + psxtmthread03/init.c: Standardize start and end test messages. + 2011-07-20 Joel Sherrill * Makefile.am, configure.ac, psxtmtests_plan.csv: Add benchmark of diff --git a/testsuites/psxtmtests/psxtmmutex02/init.c b/testsuites/psxtmtests/psxtmmutex02/init.c index 64c79a582b..13dce6a803 100644 --- a/testsuites/psxtmtests/psxtmmutex02/init.c +++ b/testsuites/psxtmtests/psxtmmutex02/init.c @@ -40,14 +40,14 @@ void *Low( end_time = benchmark_timer_read(); put_time( - "pthread_mutex_lock (unavailable)", + "pthread_mutex_lock - unavailable, block", end_time, OPERATION_COUNT, 0, 0 ); - puts( "*** END OF POSIX TIME TEST MUTEX 02 ***" ); + puts( "*** END OF POSIX TIME TEST PSXTMMUTEX02 ***" ); rtems_test_exit( 0 ); return NULL; @@ -81,7 +81,7 @@ void *POSIX_Init( int status; pthread_t threadId; - puts( "\n\n*** POSIX TIME TEST MUTEX 02 ***" ); + puts( "\n\n*** POSIX TIME TEST PSXTMMUTEX02 ***" ); for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) { status = pthread_create( &threadId, NULL, Middle, NULL ); diff --git a/testsuites/psxtmtests/psxtmmutex05/init.c b/testsuites/psxtmtests/psxtmmutex05/init.c index 05caa310d6..28a8b3e381 100644 --- a/testsuites/psxtmtests/psxtmmutex05/init.c +++ b/testsuites/psxtmtests/psxtmmutex05/init.c @@ -42,7 +42,7 @@ void *POSIX_Init( pthread_t threadId; long end_time; - puts( "\n\n*** POSIX TIME TEST MUTEX 05 ***" ); + puts( "\n\n*** POSIX TIME TEST PSXTMMUTEX05 ***" ); status = pthread_create( &threadId, NULL, Blocker, NULL ); rtems_test_assert( status == 0 ); @@ -73,14 +73,14 @@ void *POSIX_Init( rtems_test_assert( status == 0 ); put_time( - "pthread_mutex_unlock (no preemption)", + "pthread_mutex_unlock - unblocking, no preemption", end_time, 1, 0, 0 ); - puts( "*** END OF POSIX TIME TEST MUTEX 05 ***" ); + puts( "*** END OF POSIX TIME TEST PSXTMMUTEX05 ***" ); rtems_test_exit( 0 ); return NULL; diff --git a/testsuites/psxtmtests/psxtmmutex06/init.c b/testsuites/psxtmtests/psxtmmutex06/init.c index f4e974e033..8bc4c3ddfd 100644 --- a/testsuites/psxtmtests/psxtmmutex06/init.c +++ b/testsuites/psxtmtests/psxtmmutex06/init.c @@ -36,14 +36,14 @@ void *Low( rtems_test_assert( status == 0 ); put_time( - "pthread_mutex_unlock (unblocking, prempt)", + "pthread_mutex_unlock - unblocking, preempt", end_time, OPERATION_COUNT, 0, 0 ); - puts( "*** END OF POSIX TIME TEST MUTEX 07 ***" ); + puts( "*** END OF POSIX TIME TEST PSXTMMUTEX07 ***" ); rtems_test_exit( 0 ); return NULL; } @@ -77,7 +77,7 @@ void *POSIX_Init( pthread_attr_t attr; struct sched_param param; - puts( "\n\n*** POSIX TIME TEST MUTEX 02 ***" ); + puts( "\n\n*** POSIX TIME TEST PSXTMMUTEX02 ***" ); /* * Deliberately create the mutex BEFORE the threads. This way the diff --git a/testsuites/psxtmtests/psxtmnanosleep02/init.c b/testsuites/psxtmtests/psxtmnanosleep02/init.c index eca71114f6..acd1380859 100644 --- a/testsuites/psxtmtests/psxtmnanosleep02/init.c +++ b/testsuites/psxtmtests/psxtmnanosleep02/init.c @@ -35,7 +35,7 @@ void *Low( 0 ); - puts( "*** END OF POSIX TIME TEST nanosleep - blocking ***" ); + puts( "*** END OF POSIX TIME TEST PSXTMNANOSLEEP02 ***" ); rtems_test_exit( 0 ); return NULL; @@ -70,7 +70,7 @@ void *POSIX_Init( remainder.tv_sec = 0; remainder.tv_nsec = 0; - puts( "\n\n*** POSIX TIME TEST nanosleep - blocking ***" ); + puts( "\n\n*** POSIX TIME TEST PSXTMNANOSLEEP02 ***" ); for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) { status = pthread_create( &threadId, NULL, Middle, NULL ); diff --git a/testsuites/psxtmtests/psxtmsleep02/init.c b/testsuites/psxtmtests/psxtmsleep02/init.c index 4938584069..ebd5a419fe 100644 --- a/testsuites/psxtmtests/psxtmsleep02/init.c +++ b/testsuites/psxtmtests/psxtmsleep02/init.c @@ -35,7 +35,7 @@ void *Low( 0 ); - puts( "*** END OF POSIX TIME TEST sleep - blocking ***" ); + puts( "*** END OF POSIX TIME TEST PSXTMSLEEP02 ***" ); rtems_test_exit( 0 ); return NULL; @@ -57,7 +57,7 @@ void *POSIX_Init( int status; pthread_t threadId; - puts( "\n\n*** POSIX TIME TEST sleep - blocking ***" ); + puts( "\n\n*** POSIX TIME TEST PSXTMSLEEP02 ***" ); for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) { status = pthread_create( &threadId, NULL, Middle, NULL ); diff --git a/testsuites/psxtmtests/psxtmthread01/init.c b/testsuites/psxtmtests/psxtmthread01/init.c index 898220a4e8..6a4d8caaf2 100644 --- a/testsuites/psxtmtests/psxtmthread01/init.c +++ b/testsuites/psxtmtests/psxtmthread01/init.c @@ -45,7 +45,7 @@ void *POSIX_Init( void *argument ) { - puts( "\n\n*** POSIX TIME TEST THREAD 01 ***" ); + puts( "\n\n*** POSIX TIME TEST PSXTMTHREAD01 ***" ); rtems_time_test_measure_operation( "pthread_create", @@ -56,7 +56,7 @@ void *POSIX_Init( ); - puts( "*** END OF POSIX TIME TEST THREAD 01 ***" ); + puts( "*** END OF POSIX TIME TEST PSXTMTHREAD01 ***" ); rtems_test_exit(0); } diff --git a/testsuites/psxtmtests/psxtmthread03/init.c b/testsuites/psxtmtests/psxtmthread03/init.c index 2516ce972e..2b1f0e7c1e 100644 --- a/testsuites/psxtmtests/psxtmthread03/init.c +++ b/testsuites/psxtmtests/psxtmthread03/init.c @@ -45,7 +45,7 @@ void *Low( 0 ); - puts( "*** END OF POSIX TIME TEST TM02 ***" ); + puts( "*** END OF POSIX TIME TEST PSXTMTHREAD03 ***" ); rtems_test_exit( 0 ); return NULL; } @@ -74,7 +74,7 @@ void *POSIX_Init( int status; pthread_t threadId; - puts( "\n\n*** POSIX TIME TEST TM02 ***" ); + puts( "\n\n*** POSIX TIME TEST PSXTMTHREAD03 ***" ); for ( i=0 ; i < OPERATION_COUNT - 1 ; i++ ) { status = pthread_create( &threadId, NULL, Middle, NULL );