From 8b40e27c0c5d827605c5e9e6a6f09cbb8449d578 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 30 Jul 2009 00:15:59 +0000 Subject: 2009-07-29 Joel Sherrill * Makefile.am, configure.ac: Add new test to exercise as many cases as possible of not being able to allocate memory from the workspace during thread creation. * sp18/.cvsignore, sp18/Makefile.am, sp18/init.c, sp18/sp18.doc, sp18/sp18.scn: New files. --- testsuites/sptests/ChangeLog | 8 +++ testsuites/sptests/Makefile.am | 2 +- testsuites/sptests/configure.ac | 1 + testsuites/sptests/sp18/.cvsignore | 2 + testsuites/sptests/sp18/Makefile.am | 28 ++++++++++ testsuites/sptests/sp18/init.c | 105 ++++++++++++++++++++++++++++++++++++ testsuites/sptests/sp18/sp18.doc | 26 +++++++++ testsuites/sptests/sp18/sp18.scn | 6 +++ 8 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 testsuites/sptests/sp18/.cvsignore create mode 100644 testsuites/sptests/sp18/Makefile.am create mode 100644 testsuites/sptests/sp18/init.c create mode 100644 testsuites/sptests/sp18/sp18.doc create mode 100644 testsuites/sptests/sp18/sp18.scn diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index 30ab338d7f..b756ebe5ba 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,11 @@ +2009-07-29 Joel Sherrill + + * Makefile.am, configure.ac: Add new test to exercise as many cases as + possible of not being able to allocate memory from the workspace + during thread creation. + * sp18/.cvsignore, sp18/Makefile.am, sp18/init.c, sp18/sp18.doc, + sp18/sp18.scn: New files. + 2009-07-28 Joel Sherrill * Makefile.am, configure.ac: Add new test to handle the case where diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index c9cdddb84d..142e32174e 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -8,7 +8,7 @@ ACLOCAL_AMFLAGS = -I ../aclocal ## deleted over the years. SUBDIRS = \ sp01 sp02 sp03 sp04 sp05 sp06 sp07 sp08 sp09 \ - sp10 sp11 sp12 sp13 sp14 sp15 sp16 sp17 sp19 \ + sp10 sp11 sp12 sp13 sp14 sp15 sp16 sp17 sp18 sp19 \ sp20 sp21 sp22 sp23 sp24 sp25 sp26 sp27 sp27a sp28 sp29 \ sp30 sp31 sp32 sp33 sp34 sp35 sp37 sp38 sp39 \ sp40 sp41 sp42 sp43 sp44 sp45 sp46 sp47 sp48 sp49 \ diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 05ba430f59..779892706d 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -43,6 +43,7 @@ sp14/Makefile sp15/Makefile sp16/Makefile sp17/Makefile +sp18/Makefile sp19/Makefile sp20/Makefile sp21/Makefile diff --git a/testsuites/sptests/sp18/.cvsignore b/testsuites/sptests/sp18/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/sptests/sp18/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/sptests/sp18/Makefile.am b/testsuites/sptests/sp18/Makefile.am new file mode 100644 index 0000000000..b4dff4ff5b --- /dev/null +++ b/testsuites/sptests/sp18/Makefile.am @@ -0,0 +1,28 @@ +## +## $Id$ +## + +MANAGERS = all + +rtems_tests_PROGRAMS = sp18 +sp18_SOURCES = init.c + +dist_rtems_tests_DATA = sp18.scn +dist_rtems_tests_DATA += sp18.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +sp18_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + +LINK_OBJS = $(sp18_OBJECTS) $(sp18_LDADD) +LINK_LIBS = $(sp18_LDLIBS) + +sp18$(EXEEXT): $(sp18_OBJECTS) $(sp18_DEPENDENCIES) + @rm -f sp18$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/sp18/init.c b/testsuites/sptests/sp18/init.c new file mode 100644 index 0000000000..48c134a6de --- /dev/null +++ b/testsuites/sptests/sp18/init.c @@ -0,0 +1,105 @@ +/* + * COPYRIGHT (c) 1989-2009. + * 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$ + */ + +#include + +rtems_task Init( + rtems_task_argument ignored +) +{ + rtems_id task_id; + rtems_status_code sc; + bool sb; + Heap_Information_block start; + Heap_Information_block info; + void *pointer; + size_t stack_size; + + puts( "\n\n*** TEST 18 ***" ); + + puts( "Init - rtems_workspace_get_information - OK" ); + sb = rtems_workspace_get_information( &start ); + assert( sb ); + + #if 0 + printf( "Init - workspace free = %d\n", start.Free.largest ); + printf( "Init - workspace free blocks = %d\n", start.Free.number ); + #endif + assert( start.Free.number == 1 ); + stack_size = start.Free.largest; + + #if 0 + printf( "Init - start with stack size of = %d\n", stack_size ); + #endif + + puts( "Init - rtems_task_create - Unsatisfied on Extensions" ); + while (1) { + + sc = rtems_task_create( + rtems_build_name( 'T', 'E', 'S', 'T' ), + 1, + stack_size, + RTEMS_DEFAULT_MODES, + RTEMS_FLOATING_POINT, + &task_id + ); + + if ( sc == RTEMS_SUCCESSFUL ) + break; + + fatal_directive_status( sc, RTEMS_UNSATISFIED, "rtems_task_create" ); + + /* + * Verify heap is still in same shape if we couldn't allocate a task + */ + sb = rtems_workspace_get_information( &info ); + assert( sb ); + assert( info.Free.largest == start.Free.largest ); + assert( info.Free.number == start.Free.number ); + + stack_size -= 8; + if ( stack_size <= RTEMS_MINIMUM_STACK_SIZE ) + break; + } + + if ( sc != RTEMS_SUCCESSFUL ) + rtems_test_exit(0); + + /* + * Verify heap is still in same shape after we free the task + */ + puts( "Init - rtems_task_delete - OK" ); + sc = rtems_task_delete( task_id ); + directive_failed( sc, "rtems_task_delete" ); + + puts( "Init - verify workspace has same memory" ); + sb = rtems_workspace_get_information( &info ); + assert( sb ); + assert( info.Free.largest == start.Free.largest ); + assert( info.Free.number == start.Free.number ); + + puts( "*** END OF TEST 18 ***" ); + rtems_test_exit(0); +} + +/* configuration information */ + +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 2 +#define CONFIGURE_MAXIMUM_USER_EXTENSIONS 20 +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_INIT +#include + +/* global variables */ diff --git a/testsuites/sptests/sp18/sp18.doc b/testsuites/sptests/sp18/sp18.doc new file mode 100644 index 0000000000..3297338f35 --- /dev/null +++ b/testsuites/sptests/sp18/sp18.doc @@ -0,0 +1,26 @@ +# +# $Id$ +# +# COPYRIGHT (c) 1989-2009. +# 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: sp18 + +directives: + + rtems_task_create + really allocation failures in _Thread_Initialize + +concepts: + ++ Ensure that all memory is freed when some part of the task allocation + fails. We start with a stack size that consumes all memory and work + down a bit at a time until the task create is successful. This is designed + to hit all cases. diff --git a/testsuites/sptests/sp18/sp18.scn b/testsuites/sptests/sp18/sp18.scn new file mode 100644 index 0000000000..9effef4ea5 --- /dev/null +++ b/testsuites/sptests/sp18/sp18.scn @@ -0,0 +1,6 @@ +*** TEST 18 *** +Init - rtems_workspace_get_information - OK +Init - rtems_task_create - Unsatisfied on Extensions +Init - rtems_task_delete - OK +Init - verify workspace has same memory +*** END OF TEST 18 *** -- cgit v1.2.3