From a5e620e89d70794cf80a1b77965e6a3ab4127daa Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 8 Jul 2009 20:26:45 +0000 Subject: 2009-07-08 Joel Sherrill * Makefile.am, configure.ac, sp27/Makefile.am, sp27/init.c, sp27/sp27.doc, sp27/sp27.scn: Rework sp27 so it can be reinstantiated as sp27a and test flushing both counting and binary semaphores. Reformatted. * sp27a/.cvsignore, sp27a/Makefile.am, sp27a/sp27a.doc, sp27a/sp27a.scn: New files. --- testsuites/sptests/ChangeLog | 9 +++ testsuites/sptests/Makefile.am | 6 +- testsuites/sptests/configure.ac | 1 + testsuites/sptests/sp27/Makefile.am | 2 + testsuites/sptests/sp27/init.c | 134 ++++++++++++++++++++--------------- testsuites/sptests/sp27/sp27.doc | 25 +++++++ testsuites/sptests/sp27/sp27.scn | 2 +- testsuites/sptests/sp27a/.cvsignore | 2 + testsuites/sptests/sp27a/Makefile.am | 29 ++++++++ testsuites/sptests/sp27a/sp27a.doc | 25 +++++++ testsuites/sptests/sp27a/sp27a.scn | 4 ++ 11 files changed, 176 insertions(+), 63 deletions(-) create mode 100644 testsuites/sptests/sp27a/.cvsignore create mode 100644 testsuites/sptests/sp27a/Makefile.am create mode 100644 testsuites/sptests/sp27a/sp27a.doc create mode 100644 testsuites/sptests/sp27a/sp27a.scn diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index 6df346bd61..aa85fcc712 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,12 @@ +2009-07-08 Joel Sherrill + + * Makefile.am, configure.ac, sp27/Makefile.am, sp27/init.c, + sp27/sp27.doc, sp27/sp27.scn: Rework sp27 so it can be reinstantiated + as sp27a and test flushing both counting and binary semaphores. + Reformatted. + * sp27a/.cvsignore, sp27a/Makefile.am, sp27a/sp27a.doc, + sp27a/sp27a.scn: New files. + 2009-07-08 Joel Sherrill * spstkalloc/Makefile.am: Remove unneeded USE_TIMER_SERVER which was diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index dc82e0c3db..5961e7b71f 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -5,9 +5,9 @@ ACLOCAL_AMFLAGS = -I ../aclocal SUBDIRS = sp01 sp02 sp03 sp04 sp05 sp06 sp07 sp08 sp09 sp11 sp12 sp13 sp14 \ - sp15 sp16 sp17 sp19 sp20 sp21 sp22 sp23 sp24 sp25 sp26 sp27 sp28 sp29 \ - sp30 sp31 sp32 sp33 sp34 sp35 sp37 sp38 sp39 sp40 sp41 sp42 sp43 sp44 \ - sp45 sp46 sp47 sp48 sp49 sp50 sp51 sp52 sp53 sp54 sp55 sp56 sp57 \ + sp15 sp16 sp17 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 sp50 sp51 sp52 sp53 sp54 sp55 sp56 sp57 \ spchain spobjgetnext spprintk spsize spstkalloc spwatchdog spwkspace \ spfatal01 spfatal02 spfatal03 spfatal04 spfatal05 spfatal06 spfatal07 \ spfatal08 spfatal09 spfatal10 spfatal11 spfatal12 diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 6c2c24a0b2..ddede26acc 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -52,6 +52,7 @@ sp24/Makefile sp25/Makefile sp26/Makefile sp27/Makefile +sp27a/Makefile sp28/Makefile sp29/Makefile sp30/Makefile diff --git a/testsuites/sptests/sp27/Makefile.am b/testsuites/sptests/sp27/Makefile.am index b9a2d124a4..39518f939d 100644 --- a/testsuites/sptests/sp27/Makefile.am +++ b/testsuites/sptests/sp27/Makefile.am @@ -16,6 +16,8 @@ include $(top_srcdir)/../automake/leaf.am sp27_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + LINK_OBJS = $(sp27_OBJECTS) $(sp27_LDADD) LINK_LIBS = $(sp27_LDLIBS) diff --git a/testsuites/sptests/sp27/init.c b/testsuites/sptests/sp27/init.c index 6150631b8d..9e257f396c 100644 --- a/testsuites/sptests/sp27/init.c +++ b/testsuites/sptests/sp27/init.c @@ -12,110 +12,126 @@ */ #include +#include -rtems_task Init (rtems_task_argument argument); void starttask(int arg); rtems_task subtask(rtems_task_argument arg); -#define CONFIGURE_RTEMS_INIT_TASKS_TABLE - -#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER - -#define CONFIGURE_MAXIMUM_TASKS 6 -#define CONFIGURE_MAXIMUM_SEMAPHORES 1 - -#define CONFIGURE_MICROSECONDS_PER_TICK 52429 - -#define CONFIGURE_INIT - -#include - -#include #include #include #define NTASK 4 +#if defined(USE_COUNTING_SEMAPHORE) + #define TEST_NAME "27a" + #define TEST_SEMAPHORE_TYPE "counting" + #define TEST_SEMAPHORE_ATTRIBUTES RTEMS_DEFAULT_ATTRIBUTES +#else + #define TEST_NAME "27" + #define TEST_SEMAPHORE_TYPE "binary" + #define TEST_SEMAPHORE_ATTRIBUTES (RTEMS_LOCAL| \ + RTEMS_BINARY_SEMAPHORE|RTEMS_NO_INHERIT_PRIORITY| \ + RTEMS_NO_PRIORITY_CEILING|RTEMS_FIFO) +#endif + rtems_id semaphore; volatile int flags[NTASK]; -rtems_task -subtask (rtems_task_argument arg) +rtems_task subtask( + rtems_task_argument arg +) { rtems_status_code sc; for (;;) { flags[arg]++; - sc = rtems_semaphore_obtain (semaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT); + sc = rtems_semaphore_obtain(semaphore, RTEMS_WAIT, RTEMS_NO_TIMEOUT); if (sc == RTEMS_SUCCESSFUL) - puts ("Obtained semaphore -- and should not have done so!"); + puts("Obtained semaphore -- and should not have done so!"); else if (sc != RTEMS_UNSATISFIED) - printf ("Can't get semaphore: %s\n", rtems_status_text (sc)); + printf("Can't get semaphore: %s\n", rtems_status_text(sc)); } } -void -starttask (int arg) +void starttask( + int arg +) { rtems_id tid; rtems_status_code sc; rtems_task_priority priority; - rtems_task_set_priority (RTEMS_SELF, RTEMS_CURRENT_PRIORITY, &priority); - sc = rtems_task_create (rtems_build_name ('S', 'R', 'V', arg + 'A'), + rtems_task_set_priority(RTEMS_SELF, RTEMS_CURRENT_PRIORITY, &priority); + sc = rtems_task_create(rtems_build_name('S', 'R', 'V', arg + 'A'), priority, RTEMS_MINIMUM_STACK_SIZE, RTEMS_PREEMPT|RTEMS_NO_TIMESLICE|RTEMS_NO_ASR|RTEMS_INTERRUPT_LEVEL(0), RTEMS_NO_FLOATING_POINT|RTEMS_LOCAL, &tid); - if (sc != RTEMS_SUCCESSFUL) { - printf ("Can't create task: %s\n", rtems_status_text (sc)); - rtems_task_suspend (RTEMS_SELF); - } - sc = rtems_task_start (tid, subtask, (rtems_task_argument) arg); - if (sc != RTEMS_SUCCESSFUL) { - printf ("Can't start task: %s\n", rtems_status_text (sc)); - rtems_task_suspend (RTEMS_SELF); - } + directive_failed( sc, "task create" ); + + sc = rtems_task_start(tid, subtask, (rtems_task_argument) arg); + directive_failed( sc, "task start" ); } -rtems_task -Init (rtems_task_argument ignored) +void doTest() { - int pass, i; rtems_status_code sc; + rtems_attribute attr; + int pass, i; - puts( "\n\n*** TEST 27 ***" ); - puts("Testing semaphore flush"); - sc = rtems_semaphore_create ( - rtems_build_name ('S', 'E', 'M', 'F'), + sc = rtems_semaphore_create( + rtems_build_name('S', 'E', 'M', 'F'), 0, - RTEMS_LOCAL| - RTEMS_BINARY_SEMAPHORE|RTEMS_NO_INHERIT_PRIORITY| - RTEMS_NO_PRIORITY_CEILING|RTEMS_FIFO, + TEST_SEMAPHORE_ATTRIBUTES, 0, &semaphore); - if (sc != RTEMS_SUCCESSFUL) { - printf ("Can't flush semaphore: %s\n", rtems_status_text (sc)); - exit (1); - } + directive_failed( sc, "semaphore create" ); + + for (i = 0 ; i < NTASK ; i++) + flags[i] = 0; + for (i = 0 ; i < NTASK ; i++) - starttask (i); + starttask(i); + for (pass = 1 ; pass < 10 ; pass++) { - rtems_task_wake_after (1); + rtems_task_wake_after(1); for (i = 0 ; i < NTASK ; i++) { if (flags[i] != pass) - printf ("flags[%d] = %d -- expected %d\n", i, flags[i], pass); - } - sc = rtems_semaphore_flush (semaphore); - if (sc != RTEMS_SUCCESSFUL) { - printf ("Can't flush semaphore: %s\n", rtems_status_text (sc)); - exit (1); + printf("flags[%d] = %d -- expected %d\n", i, flags[i], pass); } + sc = rtems_semaphore_flush(semaphore); + directive_failed( sc, "semaphore flush" ); } - printf ("Flushed all waiting tasks\n", NTASK ); - puts( "*** END OF TEST 27 ***" ); - exit (1); + printf("Flushed all waiting tasks\n", NTASK ); +} + +rtems_task Init( + rtems_task_argument ignored +) +{ + puts( "\n\n*** TEST " TEST_NAME " ***" ); + puts( "Testing " TEST_SEMAPHORE_TYPE " semaphore flush" ); + doTest(); + puts( "*** END OF TEST " TEST_NAME " ***" ); + + rtems_test_exit(0); } + +/**************** START OF CONFIGURATION INFORMATION ****************/ + +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 6 +#define CONFIGURE_MAXIMUM_SEMAPHORES 1 + +#define CONFIGURE_INIT + +#include + +/**************** END OF CONFIGURATION INFORMATION ****************/ + diff --git a/testsuites/sptests/sp27/sp27.doc b/testsuites/sptests/sp27/sp27.doc index e69de29bb2..dc781d77d2 100644 --- a/testsuites/sptests/sp27/sp27.doc +++ b/testsuites/sptests/sp27/sp27.doc @@ -0,0 +1,25 @@ +# +# $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: sp27 + +directives: + + rtems_semaphore_create + rtems_semaphore_obtain + rtems_semaphore_flush + +concepts: + ++ Ensure that flushing a counting semaphore with multiple waiting tasks + works as expected. diff --git a/testsuites/sptests/sp27/sp27.scn b/testsuites/sptests/sp27/sp27.scn index 7b914bf614..81695e741f 100644 --- a/testsuites/sptests/sp27/sp27.scn +++ b/testsuites/sptests/sp27/sp27.scn @@ -1,4 +1,4 @@ *** TEST 27 *** -Testing semaphore flush +Testing counting semaphore flush Flushed all waiting tasks *** END OF TEST 27 *** diff --git a/testsuites/sptests/sp27a/.cvsignore b/testsuites/sptests/sp27a/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/sptests/sp27a/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/sptests/sp27a/Makefile.am b/testsuites/sptests/sp27a/Makefile.am new file mode 100644 index 0000000000..a38cb40397 --- /dev/null +++ b/testsuites/sptests/sp27a/Makefile.am @@ -0,0 +1,29 @@ +## +## $Id$ +## + +MANAGERS = all + +rtems_tests_PROGRAMS = sp27a +sp27a_SOURCES = ../sp27/init.c + +dist_rtems_tests_DATA = sp27a.scn +dist_rtems_tests_DATA += sp27a.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +sp27a_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include +AM_CPPFLAGS += -DUSE_COUNTING_SEMAPHORE + +LINK_OBJS = $(sp27a_OBJECTS) $(sp27a_LDADD) +LINK_LIBS = $(sp27a_LDLIBS) + +sp27a$(EXEEXT): $(sp27a_OBJECTS) $(sp27a_DEPENDENCIES) + @rm -f sp27a$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/sp27a/sp27a.doc b/testsuites/sptests/sp27a/sp27a.doc new file mode 100644 index 0000000000..2f041f84d3 --- /dev/null +++ b/testsuites/sptests/sp27a/sp27a.doc @@ -0,0 +1,25 @@ +# +# $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: sp27a + +directives: + + rtems_semaphore_create + rtems_semaphore_obtain + rtems_semaphore_flush + +concepts: + ++ Ensure that flushing a binary semaphore with multiple waiting tasks + works as expected. diff --git a/testsuites/sptests/sp27a/sp27a.scn b/testsuites/sptests/sp27a/sp27a.scn new file mode 100644 index 0000000000..221e3e35e1 --- /dev/null +++ b/testsuites/sptests/sp27a/sp27a.scn @@ -0,0 +1,4 @@ +*** TEST 27 *** +Testing binary semaphore flush +Flushed all waiting tasks +*** END OF TEST 27 *** -- cgit v1.2.3