From dacde6e4c15d2a878a12c98773e65396a85650ae Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 26 Jul 2011 17:30:30 +0000 Subject: 2011-07-26 Pawel Zagorski PR 1853/tests * Makefile.am, configure.ac: Add test for case where a thread is non-preemptive, multiple threads are ready at that priority, a higher priority thread is heir and the thread yields. * sp74/.cvsignore, sp74/Makefile.am, sp74/init.c, sp74/sp74.doc, sp74/sp74.scn: New files. --- testsuites/sptests/ChangeLog | 9 ++++ testsuites/sptests/Makefile.am | 2 +- testsuites/sptests/configure.ac | 1 + testsuites/sptests/sp74/.cvsignore | 2 + testsuites/sptests/sp74/Makefile.am | 26 +++++++++++ testsuites/sptests/sp74/init.c | 93 +++++++++++++++++++++++++++++++++++++ testsuites/sptests/sp74/sp74.doc | 26 +++++++++++ testsuites/sptests/sp74/sp74.scn | 6 +++ 8 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 testsuites/sptests/sp74/.cvsignore create mode 100644 testsuites/sptests/sp74/Makefile.am create mode 100644 testsuites/sptests/sp74/init.c create mode 100644 testsuites/sptests/sp74/sp74.doc create mode 100644 testsuites/sptests/sp74/sp74.scn (limited to 'testsuites') diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index 5da65eae29..9ae25ce9a6 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,12 @@ +2011-07-26 Pawel Zagorski + + PR 1853/tests + * Makefile.am, configure.ac: Add test for case where a thread is + non-preemptive, multiple threads are ready at that priority, a higher + priority thread is heir and the thread yields. + * sp74/.cvsignore, sp74/Makefile.am, sp74/init.c, sp74/sp74.doc, + sp74/sp74.scn: New files. + 2011-07-24 Joel Sherrill * sp04/tswitch.c, sp07/task1.c, sp07/task2.c, sp09/screen07.c, diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index 7f8066d894..05f5ed3adf 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -14,7 +14,7 @@ SUBDIRS = \ sp40 sp41 sp42 sp43 sp44 sp45 sp46 sp47 sp48 sp49 \ sp50 sp51 sp52 sp53 sp54 sp55 sp56 sp57 sp58 sp59 \ sp60 sp62 sp63 sp64 sp65 sp66 sp67 sp68 sp69 \ - sp70 sp71 sp72 sp73 \ + sp70 sp71 sp72 sp73 sp74 \ spassoc01 spchain spclockget spcoverage spobjgetnext \ spnotepad01 spprintk spprivenv01 sprbtree01 spsize spstkalloc \ spthreadq01 spwatchdog spwkspace \ diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 7ba1a8c025..982ade71d8 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -99,6 +99,7 @@ sp70/Makefile sp71/Makefile sp72/Makefile sp73/Makefile +sp74/Makefile spassoc01/Makefile spchain/Makefile spclockget/Makefile diff --git a/testsuites/sptests/sp74/.cvsignore b/testsuites/sptests/sp74/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/sptests/sp74/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/sptests/sp74/Makefile.am b/testsuites/sptests/sp74/Makefile.am new file mode 100644 index 0000000000..0a56183af4 --- /dev/null +++ b/testsuites/sptests/sp74/Makefile.am @@ -0,0 +1,26 @@ +## +## $Id$ +## + +MANAGERS = all + +rtems_tests_PROGRAMS = sp74 +sp74_SOURCES = init.c + +dist_rtems_tests_DATA = sp74.scn +dist_rtems_tests_DATA += sp74.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + +LINK_OBJS = $(sp74_OBJECTS) $(sp74_LDADD) +LINK_LIBS = $(sp74_LDLIBS) + +sp74$(EXEEXT): $(sp74_OBJECTS) $(sp74_DEPENDENCIES) + @rm -f sp74$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/sp74/init.c b/testsuites/sptests/sp74/init.c new file mode 100644 index 0000000000..64cdea9726 --- /dev/null +++ b/testsuites/sptests/sp74/init.c @@ -0,0 +1,93 @@ +/* + * 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 + +/* + * 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_task Test_task( + rtems_task_argument index +) +{ + puts( "Successfully yielded it to higher priority task" ); + + puts( "*** END OF SP74 TEST ***" ); + rtems_test_exit( 0 ); +} + +rtems_task Init( + rtems_task_argument argument +) +{ + rtems_status_code status; + + puts( "\n\n*** SP74 (YIELD) TEST ***" ); + + Task_name[ 1 ] = rtems_build_name( 'T', 'A', '1', ' ' ); + Task_name[ 2 ] = rtems_build_name( 'T', 'A', '2', ' ' ); + + puts( "Create TA1 at higher priority task" ); + status = rtems_task_create( + Task_name[ 1 ], + 1, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, + &Task_id[ 1 ] + ); + directive_failed( status, "create 1" ); + + puts( "Create TA2 at equal priority task" ); + status = rtems_task_create( + Task_name[ 2 ], + 2, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, + &Task_id[ 2 ] + ); + directive_failed( status, "create 2" ); + + status = rtems_task_start( Task_id[ 1 ], Test_task, 1 ); + directive_failed( status, "start 1" ); + + status = rtems_task_start( Task_id[ 2 ], Test_task, 2 ); + directive_failed( status, "start 2" ); + + puts( "Yield to TA1" ); + status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR ); + directive_failed( status, "yield" ); + + puts( "*** should now get here ***" ); +} + +/* configuration information */ +#include /* for device driver prototypes */ + +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 3 +#define CONFIGURE_INIT_TASK_PRIORITY 2 + +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_INIT +#include +/* end of file */ diff --git a/testsuites/sptests/sp74/sp74.doc b/testsuites/sptests/sp74/sp74.doc new file mode 100644 index 0000000000..699dd97fa7 --- /dev/null +++ b/testsuites/sptests/sp74/sp74.doc @@ -0,0 +1,26 @@ +# +# $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: spsimplesched04 + +directives: + + rtems_task_wake_after - yield case when non-preemptive + +concepts: + ++ This test is specifically designed to exercise the yield case when + a task is non-preemptive, a higher priority task is ready, and there + are multiple threads ready at the same priority as the non-preemptive + task. + ++ test where there is more than one thread at a priority with the executing thread being non-preemptive. Create a higher priority thread and then yield. sparc init task at priority 2, non-preemptive create task at priority 2 create task at priority 1 yield diff --git a/testsuites/sptests/sp74/sp74.scn b/testsuites/sptests/sp74/sp74.scn new file mode 100644 index 0000000000..a4a01d49e4 --- /dev/null +++ b/testsuites/sptests/sp74/sp74.scn @@ -0,0 +1,6 @@ +*** SP74 (YIELD) TEST *** +Create TA1 at higher priority task +Create TA2 at equal priority task +Yield to TA1 +Successfully yielded it to higher priority task +*** END OF SP74 TEST *** -- cgit v1.2.3