From a27fa6d54379c25ef35149360a7dcaf63825a778 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 4 Dec 2006 14:10:48 +0000 Subject: 2006-12-04 Joel Sherrill * sp33/init.c: Improve barrier test to include normal blocking with manual release and unblocking in barrier deletion. --- testsuites/sptests/ChangeLog | 5 ++ testsuites/sptests/sp33/init.c | 130 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 123 insertions(+), 12 deletions(-) (limited to 'testsuites') diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index e0bf221b17..ac679572b2 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,8 @@ +2006-12-04 Joel Sherrill + + * sp33/init.c: Improve barrier test to include normal blocking with + manual release and unblocking in barrier deletion. + 2006-12-02 Ralf Corsépius * configure.ac: New BUG-REPORT address. diff --git a/testsuites/sptests/sp33/init.c b/testsuites/sptests/sp33/init.c index e6a773db40..71ba56f987 100644 --- a/testsuites/sptests/sp33/init.c +++ b/testsuites/sptests/sp33/init.c @@ -17,11 +17,40 @@ rtems_task Init (rtems_task_argument ignored); #define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER -#define CONFIGURE_MAXIMUM_TASKS 1 +#define CONFIGURE_MAXIMUM_TASKS 5 #define CONFIGURE_MAXIMUM_BARRIERS 1 #define CONFIGURE_INIT +rtems_id Barrier; + +int SuccessfulCase; +int DeletedCase; + +rtems_task Waiter( + rtems_task_argument number +) +{ + rtems_status_code status; + + printf( "Waiter %d waiting on barrier\n", number ); + status = rtems_barrier_wait( Barrier, RTEMS_NO_TIMEOUT ); + + printf( "Waiter %d back from barrier\n", number ); + + if ( SuccessfulCase == TRUE ) { + directive_failed(status, "rtems_barrier_wait"); + } else if ( DeletedCase == TRUE ) { + fatal_directive_status( + status, + RTEMS_OBJECT_WAS_DELETED, + "rtems_barrier_wait did not get deleted" + ); + } + + rtems_task_delete( RTEMS_SELF ); +} + #include rtems_task Init( @@ -29,39 +58,116 @@ rtems_task Init( ) { rtems_status_code status; - rtems_name name = rtems_build_name('B','A','R','1'); - rtems_id id; - uint32_t released; + rtems_name name = rtems_build_name('B','A','R','1'); + uint32_t released; + rtems_id testId; + rtems_id Tasks[CONFIGURE_MAXIMUM_TASKS-1]; + uint32_t i; puts("\n\n*** TEST 33 ***"); /* create period */ puts( "Create Barrier" ); - status = rtems_barrier_create( name, RTEMS_DEFAULT_ATTRIBUTES, 0, &id ); + status = rtems_barrier_create( name, RTEMS_DEFAULT_ATTRIBUTES, 0, &Barrier ); directive_failed(status, "rtems_barrier_create"); - puts( "Wait on Barrier w/timeout" ); - status = rtems_barrier_wait( id, 10 ); + puts( "Check Barrier ident" ); + status = rtems_barrier_ident( name, &testId ); + directive_failed(status, "rtems_barrier_ident"); + if ( testId != Barrier ) { + printf( "ERROR -- rtems_barrier_create -- did not get Id expected\n" ); + exit( 0 ); + } + + puts( "Wait on Barrier w/timeout and TIMEOUT" ); + status = rtems_barrier_wait( Barrier, 25 ); fatal_directive_status( status, RTEMS_TIMEOUT, "rtems_barrier_wait did not timeout" ); -#if 0 - /* start period with initial value */ - status = rtems_barrier_release( id, &released ); + /* Release no tasks */ + status = rtems_barrier_release( Barrier, &released ); directive_failed(status, "rtems_barrier_release"); if ( released != 0 ) { printf( "ERROR -- rtems_barrier_release -- released != 0, = %d", released); exit(0); } -#endif + + /* + * Create some tasks to wait for the barrier + */ + SuccessfulCase = TRUE; + DeletedCase = FALSE; + puts( "\n*** Testing Regular Release of Barrier ***" ); + for (i=0 ; i<(CONFIGURE_MAXIMUM_TASKS-1) ; i++) { + status = rtems_task_create( + rtems_build_name('W','A','I','T'), + 1, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, + &Tasks[ i ] + ); + directive_failed( status, "rtems_task_create of Waiter" ); + + status = rtems_task_start( Tasks[ i ], Waiter, i ); + directive_failed( status, "rtems_task_start of Waiter" ); + } + + + puts( "Delay to let Waiters block" ); + status = rtems_task_wake_after( TICKS_PER_SECOND ); + directive_failed(status, "rtems_task_wake_after"); + + /* Release tasks which were waiting */ + puts( "Releasing tasks" ); + status = rtems_barrier_release( Barrier, &released ); + directive_failed(status, "rtems_barrier_release"); + if ( released != (CONFIGURE_MAXIMUM_TASKS-1) ) { + printf( "ERROR -- rtems_barrier_release -- released != %d, = %d", + (CONFIGURE_MAXIMUM_TASKS-1), released); + exit(0); + } + + puts( "Delay to let Waiters print a message" ); + status = rtems_task_wake_after( TICKS_PER_SECOND ); + directive_failed(status, "rtems_task_wake_after"); + + /* + * Create some tasks to wait for the barrier + */ + SuccessfulCase = FALSE; + DeletedCase = TRUE; + puts( "\n*** Testing Deletion of Barrier ***" ); + for (i=0 ; i<(CONFIGURE_MAXIMUM_TASKS-1) ; i++) { + status = rtems_task_create( + rtems_build_name('W','A','I','T'), + 1, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, + &Tasks[ i ] + ); + directive_failed( status, "rtems_task_create of Waiter" ); + + status = rtems_task_start( Tasks[ i ], Waiter, i ); + directive_failed( status, "rtems_task_start of Waiter" ); + } + + puts( "Delay to let Waiters block" ); + status = rtems_task_wake_after( TICKS_PER_SECOND ); + directive_failed(status, "rtems_task_wake_after"); puts( "Delete barrier" ); - status = rtems_barrier_delete(id); + status = rtems_barrier_delete( Barrier ); directive_failed(status, "rtems_barrier_delete"); + puts( "Delay to let Waiters print a message" ); + status = rtems_task_wake_after( TICKS_PER_SECOND ); + directive_failed(status, "rtems_task_wake_after"); + /* the end */ printf("*** END OF TEST SP33 ***\n"); exit(0); -- cgit v1.2.3