diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-03-16 16:33:04 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-03-16 16:33:04 +0000 |
| commit | 5bbc204431e8b2fbec5b06e38434031ed92e1d5c (patch) | |
| tree | 51570e5b0d54b36bc9285269684a61ccb014d7d9 | |
| parent | 2011-03-16 Jennifer Averett <jennifer.averett@OARcorp.com> (diff) | |
| download | rtems-5bbc204431e8b2fbec5b06e38434031ed92e1d5c.tar.bz2 | |
2011-03-16 Jennifer Averett <jennifer.averett@OARcorp.com>
PR 1743/cpu
* Makefile.am, configure.ac, spsize/size.c: Add Simple Priority
Scheduler as complement to existing Deterministic Priority Scheduler.
This scheduler serves both as an example and as a lighter weight
implementation for smaller systems.
* spsimplesched01/.cvsignore, spsimplesched01/Makefile.am,
spsimplesched01/init.c, spsimplesched01/spsimplesched01.doc,
spsimplesched01/spsimplesched01.scn, spsimplesched02/.cvsignore,
spsimplesched02/Makefile.am, spsimplesched02/init.c,
spsimplesched02/spsimplesched02.doc,
spsimplesched02/spsimplesched02.scn, spsimplesched03/.cvsignore,
spsimplesched03/Makefile.am, spsimplesched03/init.c,
spsimplesched03/spsimplesched03.doc,
spsimplesched03/spsimplesched03.scn: New files.
19 files changed, 546 insertions, 20 deletions
diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index 97f3e59e9a..2100d2ea77 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,20 @@ +2011-03-16 Jennifer Averett <jennifer.averett@OARcorp.com> + + PR 1743/cpu + * Makefile.am, configure.ac, spsize/size.c: Add Simple Priority + Scheduler as complement to existing Deterministic Priority Scheduler. + This scheduler serves both as an example and as a lighter weight + implementation for smaller systems. + * spsimplesched01/.cvsignore, spsimplesched01/Makefile.am, + spsimplesched01/init.c, spsimplesched01/spsimplesched01.doc, + spsimplesched01/spsimplesched01.scn, spsimplesched02/.cvsignore, + spsimplesched02/Makefile.am, spsimplesched02/init.c, + spsimplesched02/spsimplesched02.doc, + spsimplesched02/spsimplesched02.scn, spsimplesched03/.cvsignore, + spsimplesched03/Makefile.am, spsimplesched03/init.c, + spsimplesched03/spsimplesched03.doc, + spsimplesched03/spsimplesched03.scn: New files. + 2011-03-11 Joel Sherrill <joel.sherrilL@OARcorp.com> * sp58/init.c, sp58/sp58.scn: Account for case where left hand side diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index 202026b4e9..eee0654712 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -28,7 +28,8 @@ SUBDIRS = \ spintrcritical05 spintrcritical06 spintrcritical07 spintrcritical08 \ spintrcritical09 spintrcritical10 spintrcritical11 spintrcritical12 \ spintrcritical13 spintrcritical14 spintrcritical15 spintrcritical16 \ - spintrcritical17 spmkdir spmountmgr01 spheapprot + spintrcritical17 spmkdir spmountmgr01 spheapprot \ + spsimplesched01 spsimplesched02 spsimplesched03 DIST_SUBDIRS = $(SUBDIRS) spfatal_support spintrcritical_support EXTRA_DIST = spfatal_support/init.c spfatal_support/system.h diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 4232720841..d53fc011a7 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -160,6 +160,9 @@ spnotepad01/Makefile spobjgetnext/Makefile spprintk/Makefile spprivenv01/Makefile +spsimplesched01/Makefile +spsimplesched02/Makefile +spsimplesched03/Makefile spsize/Makefile spstkalloc/Makefile spthreadq01/Makefile diff --git a/testsuites/sptests/spsimplesched01/.cvsignore b/testsuites/sptests/spsimplesched01/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/sptests/spsimplesched01/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/sptests/spsimplesched01/Makefile.am b/testsuites/sptests/spsimplesched01/Makefile.am new file mode 100644 index 0000000000..dacfee08ef --- /dev/null +++ b/testsuites/sptests/spsimplesched01/Makefile.am @@ -0,0 +1,28 @@ +## +## $Id$ +## + +MANAGERS = all + +rtems_tests_PROGRAMS = spsimplesched01 +spsimplesched01_SOURCES = init.c + +dist_rtems_tests_DATA = spsimplesched01.scn +dist_rtems_tests_DATA += spsimplesched01.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +spsimplesched01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + +LINK_OBJS = $(spsimplesched01_OBJECTS) $(spsimplesched01_LDADD) +LINK_LIBS = $(spsimplesched01_LDLIBS) + +spsimplesched01$(EXEEXT): $(spsimplesched01_OBJECTS) $(spsimplesched01_DEPENDENCIES) + @rm -f spsimplesched01$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spsimplesched01/init.c b/testsuites/sptests/spsimplesched01/init.c new file mode 100644 index 0000000000..95eaaa2b1a --- /dev/null +++ b/testsuites/sptests/spsimplesched01/init.c @@ -0,0 +1,115 @@ +/* + * COPYRIGHT (c) 2011. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + * $Id$ + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <tmacros.h> + +/* + * Keep the names and IDs in global variables so another task can use them. + */ +rtems_id Task_id[ 4 ]; /* array of task ids */ +rtems_name Task_name[ 4 ]; /* array of task names */ + +rtems_task Test_task( + rtems_task_argument unused +) +{ + rtems_id tid; + rtems_time_of_day time; + uint32_t task_index; + rtems_status_code status; + + status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid ); + task_index = task_number( tid ); + for ( ; ; ) { + status = rtems_clock_get_tod( &time ); + if ( time.second >= 35 ) { + puts( "*** END OF SIMPLE01 TEST ***" ); + rtems_test_exit( 0 ); + } + put_name( Task_name[ task_index ], FALSE ); + print_time( " - rtems_clock_get_tod - ", &time, "\n" ); + status = rtems_task_wake_after( + task_index * 5 * rtems_clock_get_ticks_per_second() ); + } +} + +rtems_task Init( + rtems_task_argument argument +) +{ + rtems_status_code status; + rtems_time_of_day time; + rtems_task_priority old; + + puts( "\n\n*** SIMPLE01 TEST ***" ); + + time.year = 1988; + time.month = 12; + time.day = 31; + time.hour = 9; + time.minute = 0; + time.second = 0; + time.ticks = 0; + + status = rtems_clock_set( &time ); + + Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' ); + Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' ); + Task_name[ 3 ] = rtems_build_name( 'T', 'A', '3', ' ' ); + + status = rtems_task_create( + Task_name[ 1 ], 1, RTEMS_MINIMUM_STACK_SIZE * 2, RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 1 ] + ); + status = rtems_task_create( + Task_name[ 2 ], 1, RTEMS_MINIMUM_STACK_SIZE * 2, RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 2 ] + ); + status = rtems_task_create( + Task_name[ 3 ], 1, RTEMS_MINIMUM_STACK_SIZE * 2, RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 3 ] + ); + + status = rtems_task_start( Task_id[ 1 ], Test_task, 1 ); + rtems_task_wake_after( RTEMS_YIELD_PROCESSOR ); + status = rtems_task_start( Task_id[ 2 ], Test_task, 2 ); + rtems_task_wake_after( RTEMS_YIELD_PROCESSOR ); + status = rtems_task_start( Task_id[ 3 ], Test_task, 3 ); + + rtems_task_set_priority(Task_id[1], 2, &old); + rtems_task_set_priority(Task_id[2], 2, &old); + rtems_task_set_priority(Task_id[3], 2, &old); + + rtems_task_wake_after( RTEMS_YIELD_PROCESSOR ); + + status = rtems_task_delete( RTEMS_SELF ); +} + +/* configuration information */ +#include <bsp.h> /* for device driver prototypes */ + +#define CONFIGURE_SCHEDULER_SIMPLE +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 4 + +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE) + +#define CONFIGURE_INIT +#include <rtems/confdefs.h> +/* end of file */ diff --git a/testsuites/sptests/spsimplesched01/spsimplesched01.doc b/testsuites/sptests/spsimplesched01/spsimplesched01.doc new file mode 100644 index 0000000000..39cc6fecd6 --- /dev/null +++ b/testsuites/sptests/spsimplesched01/spsimplesched01.doc @@ -0,0 +1,23 @@ +# +# $Id$ +# +# COPYRIGHT (c) 2011. +# On-Line Applications Research Corporation (OAR). +# +# The license and distribution terms for this file may be +# found in the file LICENSE in this distribution or at +# http://www.rtems.com/license/LICENSE. +# + +This file describes the directives and concepts tested by this test set. + +test set name: spsimplesched01 + +directives: + + rtems_task_wake_after - yield case + + rtems_task_set_priority - preempt and no preempt case + +concepts: + ++ The purpose of this test is to exercise paths in the Simple Scheduler. + It exercises Initialization, Allocate, Free, Block, Unblock, and Yield. diff --git a/testsuites/sptests/spsimplesched01/spsimplesched01.scn b/testsuites/sptests/spsimplesched01/spsimplesched01.scn new file mode 100644 index 0000000000..1a55c904f3 --- /dev/null +++ b/testsuites/sptests/spsimplesched01/spsimplesched01.scn @@ -0,0 +1,16 @@ +*** SIMPLE01 TEST *** +TA1 - clock_get_tod - 09:00:00 12/31/1988 +TA2 - clock_get_tod - 09:00:00 12/31/1988 +TA3 - clock_get_tod - 09:00:00 12/31/1988 +TA1 - clock_get_tod - 09:00:05 12/31/1988 +TA1 - clock_get_tod - 09:00:10 12/31/1988 +TA2 - clock_get_tod - 09:00:10 12/31/1988 +TA1 - clock_get_tod - 09:00:15 12/31/1988 +TA3 - clock_get_tod - 09:00:15 12/31/1988 +TA1 - clock_get_tod - 09:00:20 12/31/1988 +TA2 - clock_get_tod - 09:00:20 12/31/1988 +TA1 - clock_get_tod - 09:00:25 12/31/1988 +TA1 - clock_get_tod - 09:00:30 12/31/1988 +TA2 - clock_get_tod - 09:00:30 12/31/1988 +TA3 - clock_get_tod - 09:00:30 12/31/1988 +*** END OF SIMPLE01 TEST *** diff --git a/testsuites/sptests/spsimplesched02/.cvsignore b/testsuites/sptests/spsimplesched02/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/sptests/spsimplesched02/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/sptests/spsimplesched02/Makefile.am b/testsuites/sptests/spsimplesched02/Makefile.am new file mode 100644 index 0000000000..fad1747b9a --- /dev/null +++ b/testsuites/sptests/spsimplesched02/Makefile.am @@ -0,0 +1,28 @@ +## +## $Id$ +## + +MANAGERS = all + +rtems_tests_PROGRAMS = spsimplesched02 +spsimplesched02_SOURCES = init.c + +dist_rtems_tests_DATA = spsimplesched02.scn +dist_rtems_tests_DATA += spsimplesched02.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +spsimplesched02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + +LINK_OBJS = $(spsimplesched02_OBJECTS) $(spsimplesched02_LDADD) +LINK_LIBS = $(spsimplesched02_LDLIBS) + +spsimplesched02$(EXEEXT): $(spsimplesched02_OBJECTS) $(spsimplesched02_DEPENDENCIES) + @rm -f spsimplesched02$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spsimplesched02/init.c b/testsuites/sptests/spsimplesched02/init.c new file mode 100644 index 0000000000..381d4ca229 --- /dev/null +++ b/testsuites/sptests/spsimplesched02/init.c @@ -0,0 +1,143 @@ +/* + * COPYRIGHT (c) 2011. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + * $Id$ + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <tmacros.h> + +/* + * Keep the names and IDs in global variables so another task can use them. + */ +rtems_id Task_id[ 3 ]; /* array of task ids */ +rtems_name Task_name[ 3 ]; /* array of task names */ +rtems_name Semaphore_name[ 2 ]; +rtems_id Semaphore_id[ 2 ]; + +rtems_task Test_task( + rtems_task_argument unused +) +{ + rtems_id tid; + uint32_t task_index; + rtems_status_code status; + + status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &tid ); + task_index = task_number( tid ); + + for ( ; ; ) { + rtems_task_wake_after( RTEMS_YIELD_PROCESSOR ); + } +} + +void ObtainRelease( bool suspendIdle ) +{ + rtems_status_code status; + + if (suspendIdle) { + puts( "INIT - Suspend Idle Task"); + status = rtems_task_suspend( _Thread_Idle->Object.id ); + directive_failed( status, "rtems_task_suspend idle" ); + } + + puts( "INIT - Obtain priority ceiling semaphore - priority increases" ); + status= rtems_semaphore_obtain( Semaphore_id[1], RTEMS_DEFAULT_OPTIONS, 0 ); + directive_failed( status, "rtems_semaphore_obtain" ); + + puts( "INIT - Obtain priority ceiling semaphore - priority decreases" ); + status = rtems_semaphore_release( Semaphore_id[1] ); + directive_failed( status, "rtems_semaphore_release" ); + + if (suspendIdle) { + puts( "INIT - Resume Idle Task"); + status = rtems_task_resume( _Thread_Idle->Object.id ); + directive_failed( status, "rtems_task_resume idle" ); + } +} + +rtems_task Init( + rtems_task_argument argument +) +{ + rtems_status_code status; + + puts( "\n\n*** SIMPLE SCHEDULER 02 TEST ***" ); + + /* + * Create the semaphore. Then obtain and release the + * semaphore with no other tasks running. + */ + puts( "INIT - Create priority ceiling semaphore" ); + Semaphore_name[ 1 ] = rtems_build_name( 'S', 'M', '1', ' ' ); + status = rtems_semaphore_create( + Semaphore_name[ 1 ], + 1, + RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY_CEILING | RTEMS_PRIORITY, + 2, + &Semaphore_id[ 1 ] + ); + directive_failed( status, "rtems_semaphore_create of SM1" ); + ObtainRelease( false ); + + /* + * Create test task and obtain release the semaphore with + * one other task running. + */ + puts( "INIT - create task 1" ); + Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' ); + status = rtems_task_create( + Task_name[ 1 ], 1, RTEMS_MINIMUM_STACK_SIZE * 2, RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 1 ] + ); + status = rtems_task_start( Task_id[ 1 ], Test_task, 1 ); + ObtainRelease( false ); + + /* + * Create a a second test task and obtain release the semaphore + * with both tasks running. + */ + puts( "INIT - create task 2" ); + Task_name[ 1 ] = rtems_build_name( 'T', 'A', '2', ' ' ); + status = rtems_task_create( + Task_name[ 2 ], 1, RTEMS_MINIMUM_STACK_SIZE * 2, RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, &Task_id[ 2 ] + ); + status = rtems_task_start( Task_id[ 2 ], Test_task, 1 ); + ObtainRelease( false ); + + /* + * Obtain and release the semaphore with the idle task suspended. + */ + ObtainRelease( true ); + + /* End the Test */ + puts( "*** END OF SIMPLE SCHEDULER 02 TEST ***" ); + rtems_test_exit(0); +} + +/* configuration information */ + +#define CONFIGURE_SCHEDULER_SIMPLE +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 3 +#define CONFIGURE_MAXIMUM_SEMAPHORES 2 + +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_EXTRA_TASK_STACKS (3 * RTEMS_MINIMUM_STACK_SIZE) +#define CONFIGURE_INIT_TASK_PRIORITY 4 + +#define CONFIGURE_INIT +#include <rtems/confdefs.h> +/* end of include file */ diff --git a/testsuites/sptests/spsimplesched02/spsimplesched02.doc b/testsuites/sptests/spsimplesched02/spsimplesched02.doc new file mode 100644 index 0000000000..0db30ae941 --- /dev/null +++ b/testsuites/sptests/spsimplesched02/spsimplesched02.doc @@ -0,0 +1,24 @@ +# +# $Id$ +# +# COPYRIGHT (c) 2011. +# On-Line Applications Research Corporation (OAR). +# +# The license and distribution terms for this file may be +# found in the file LICENSE in this distribution or at +# http://www.rtems.com/license/LICENSE. +# + +This file describes the directives and concepts tested by this test set. + +test set name: spsimplesched02 + +directives: + + rtems_semaphore_create + + rtems_semaphore_obtain + + rtems_semaphore_release + +concepts: + ++ The purpose of this test is to exercise paths in the Simple Scheduler. + It exercises logic required to inherit and restore priority. diff --git a/testsuites/sptests/spsimplesched02/spsimplesched02.scn b/testsuites/sptests/spsimplesched02/spsimplesched02.scn new file mode 100644 index 0000000000..db57c882b4 --- /dev/null +++ b/testsuites/sptests/spsimplesched02/spsimplesched02.scn @@ -0,0 +1,15 @@ +*** SIMPLE SCHEDULER 02 TEST *** +INIT - Create priority ceiling semaphore +INIT - Obtain priority ceiling semaphore - priority increases +INIT - Obtain priority ceiling semaphore - priority decreases +INIT - create task 1 +INIT - Obtain priority ceiling semaphore - priority increases +INIT - Obtain priority ceiling semaphore - priority decreases +INIT - create task 2 +INIT - Obtain priority ceiling semaphore - priority increases +INIT - Obtain priority ceiling semaphore - priority decreases +INIT - Suspend Idle Task +INIT - Obtain priority ceiling semaphore - priority increases +INIT - Obtain priority ceiling semaphore - priority decreases +INIT - Resume Idle Task +*** END OF SIMPLE SCHEDULER 02 TEST *** diff --git a/testsuites/sptests/spsimplesched03/.cvsignore b/testsuites/sptests/spsimplesched03/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/sptests/spsimplesched03/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/sptests/spsimplesched03/Makefile.am b/testsuites/sptests/spsimplesched03/Makefile.am new file mode 100644 index 0000000000..d90e9ecb5e --- /dev/null +++ b/testsuites/sptests/spsimplesched03/Makefile.am @@ -0,0 +1,28 @@ +## +## $Id$ +## + +MANAGERS = all + +rtems_tests_PROGRAMS = spsimplesched03 +spsimplesched03_SOURCES = init.c + +dist_rtems_tests_DATA = spsimplesched03.scn +dist_rtems_tests_DATA += spsimplesched03.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +spsimplesched03_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + +LINK_OBJS = $(spsimplesched03_OBJECTS) $(spsimplesched03_LDADD) +LINK_LIBS = $(spsimplesched03_LDLIBS) + +spsimplesched03$(EXEEXT): $(spsimplesched03_OBJECTS) $(spsimplesched03_DEPENDENCIES) + @rm -f spsimplesched03$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spsimplesched03/init.c b/testsuites/sptests/spsimplesched03/init.c new file mode 100644 index 0000000000..2e190c2619 --- /dev/null +++ b/testsuites/sptests/spsimplesched03/init.c @@ -0,0 +1,50 @@ +/* + * COPYRIGHT (c) 2011. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + * $Id$ + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <tmacros.h> + +rtems_task Init( + rtems_task_argument argument +) +{ + rtems_status_code status; + + puts( "\n\n*** SIMPLE SCHEDULER 03 TEST ***" ); + + puts( "INIT - rtems timer initiate server"); + status = rtems_timer_initiate_server( + RTEMS_TIMER_SERVER_DEFAULT_PRIORITY, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_ATTRIBUTES + ); + directive_failed( status, "Timer Initiate Server" ); + + /* End the Test */ + puts( "*** END OF SIMPLE SCHEDULER 03 TEST ***" ); + rtems_test_exit(0); +} + +/* configuration information */ +#define CONFIGURE_SCHEDULER_SIMPLE +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 2 +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE +#define CONFIGURE_INIT_TASK_PRIORITY 2 + +#define CONFIGURE_INIT +#include <rtems/confdefs.h> +/* end of include file */ diff --git a/testsuites/sptests/spsimplesched03/spsimplesched03.doc b/testsuites/sptests/spsimplesched03/spsimplesched03.doc new file mode 100644 index 0000000000..9d60c4b61a --- /dev/null +++ b/testsuites/sptests/spsimplesched03/spsimplesched03.doc @@ -0,0 +1,22 @@ +# +# $Id$ +# +# COPYRIGHT (c) 2011. +# On-Line Applications Research Corporation (OAR). +# +# The license and distribution terms for this file may be +# found in the file LICENSE in this distribution or at +# http://www.rtems.com/license/LICENSE. +# + +This file describes the directives and concepts tested by this test set. + +test set name: spsimplesched03 + +directives: + + rtems_timer_initiate_server + +concepts: + ++ The purpose of this test is to exercise paths in the Simple Scheduler. + It exercises the preemption of the zero priority Timer Server. diff --git a/testsuites/sptests/spsimplesched03/spsimplesched03.scn b/testsuites/sptests/spsimplesched03/spsimplesched03.scn new file mode 100644 index 0000000000..9dd2e8414d --- /dev/null +++ b/testsuites/sptests/spsimplesched03/spsimplesched03.scn @@ -0,0 +1,3 @@ +*** SIMPLE SCHEDULER 03 TEST *** +INIT - rtems timer initiate server +*** END OF SIMPLE SCHEDULER 03 TEST *** diff --git a/testsuites/sptests/spsize/size.c b/testsuites/sptests/spsize/size.c index bd14268f7e..9ecc1c13d3 100644 --- a/testsuites/sptests/spsize/size.c +++ b/testsuites/sptests/spsize/size.c @@ -72,26 +72,30 @@ void print_formula(void); #define HEAP_OVHD 16 /* wasted heap space per task stack */ #define NAME_PTR_SIZE 8 /* size of name and pointer table entries */ -#if CONFIGURE_SCHEDULER_POLICY == _Scheduler_PRIORITY - #include <rtems/score/prioritybitmap.h> - - /* Priority scheduling uninitialized (globals) consumption */ - #define SCHEDULER_OVHD ((sizeof _Scheduler) + \ - (sizeof _Priority_Major_bit_map) + \ - (sizeof _Priority_Bit_map)) - - /* Priority scheduling per-thread consumption. Gets - * included in the PER_TASK consumption. */ - #define SCHEDULER_TASK_WKSP (sizeof(Scheduler_priority_Per_thread)) - - /* Priority scheduling workspace consumption - * - * Include allocation of ready queue. Pointers are already counted by - * including _Scheduler in SCHEDULER_OVHD. - */ - #define SCHEDULER_WKSP_SIZE \ +/* + * This assumes the default Priority Scheduler + */ +#include <rtems/score/prioritybitmap.h> +#include <rtems/score/schedulerpriority.h> + +/* Priority scheduling uninitialized (globals) consumption */ +#define SCHEDULER_OVHD ((sizeof _Scheduler) + \ + (sizeof _Priority_Major_bit_map) + \ + (sizeof _Priority_Bit_map)) + +/* Priority scheduling per-thread consumption. Gets + * included in the PER_TASK consumption. + */ +#define SCHEDULER_TASK_WKSP (sizeof(Scheduler_priority_Per_thread)) + +/* Priority scheduling workspace consumption + * + * Include allocation of ready queue. Pointers are already counted by + * including _Scheduler in SCHEDULER_OVHD. + */ +#define SCHEDULER_WKSP_SIZE \ ((RTEMS_MAXIMUM_PRIORITY + 1) * sizeof(Chain_Control )) -#endif +/****** END OF MEMORY USAGE OF DEFAULT PRIORITY SCHEDULER ******/ #define PER_TASK \ (long) (sizeof (Thread_Control) + \ |