diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-07-23 20:30:01 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-07-23 20:30:01 +0000 |
commit | 6ffde61c4c5ca585d74fbf2a70e5770bd6226161 (patch) | |
tree | d4f062b8edb2e3f4dc98d3279c7e5844c15afcbb /testsuites/psxtests | |
parent | 2009-07-23 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-6ffde61c4c5ca585d74fbf2a70e5770bd6226161.tar.bz2 |
2009-07-23 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am, configure.ac: Add test to exercise interrupt
synchronization logic in _POSIX_Timer_Insert_helper that supports
POSIX timers.
* psxintrcritical01/.cvsignore, psxintrcritical01/Makefile.am,
psxintrcritical01/init.c, psxintrcritical01/psxintrcritical01.doc,
psxintrcritical01/psxintrcritical01.scn: New files.
Diffstat (limited to 'testsuites/psxtests')
-rw-r--r-- | testsuites/psxtests/ChangeLog | 9 | ||||
-rw-r--r-- | testsuites/psxtests/Makefile.am | 10 | ||||
-rw-r--r-- | testsuites/psxtests/configure.ac | 1 | ||||
-rw-r--r-- | testsuites/psxtests/psxintrcritical01/.cvsignore | 2 | ||||
-rw-r--r-- | testsuites/psxtests/psxintrcritical01/Makefile.am | 30 | ||||
-rw-r--r-- | testsuites/psxtests/psxintrcritical01/init.c | 93 | ||||
-rw-r--r-- | testsuites/psxtests/psxintrcritical01/psxintrcritical01.doc | 24 | ||||
-rw-r--r-- | testsuites/psxtests/psxintrcritical01/psxintrcritical01.scn | 5 |
8 files changed, 170 insertions, 4 deletions
diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog index 6d973232d5..fc2b9940ee 100644 --- a/testsuites/psxtests/ChangeLog +++ b/testsuites/psxtests/ChangeLog @@ -1,3 +1,12 @@ +2009-07-23 Joel Sherrill <joel.sherrill@OARcorp.com> + + * Makefile.am, configure.ac: Add test to exercise interrupt + synchronization logic in _POSIX_Timer_Insert_helper that supports + POSIX timers. + * psxintrcritical01/.cvsignore, psxintrcritical01/Makefile.am, + psxintrcritical01/init.c, psxintrcritical01/psxintrcritical01.doc, + psxintrcritical01/psxintrcritical01.scn: New files. + 2009-07-23 Santosh G Vattam <vattam.santosh@gmail.com> * psxcancel/Makefile.am, psxcancel/init.c, psxcancel/psxcancel.scn: Add diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am index 6e963705de..e30bf26201 100644 --- a/testsuites/psxtests/Makefile.am +++ b/testsuites/psxtests/Makefile.am @@ -6,10 +6,12 @@ ACLOCAL_AMFLAGS = -I ../aclocal SUBDIRS = psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \ psx10 psx11 psx12 psx13 psx14 psxautoinit01 psxautoinit02 psxbarrier01 \ - psxcancel psxcleanup psxcond01 psxenosys psxfatal01 psxfatal02 psxkey01 \ - psxitimer psxmsgq01 psxmsgq02 psxmsgq03 psxmutexattr01 psxobj01 \ - psxrwlock01 psxsem01 psxsignal01 psxspin01 psxspin02 psxsysconf \ - psxtime psxtimer01 psxtimer02 psxualarm + psxcancel psxcleanup psxcond01 psxenosys psxkey01 psxitimer psxmsgq01 \ + psxmsgq02 psxmsgq03 psxmutexattr01 psxobj01 psxrwlock01 psxsem01 \ + psxsignal01 psxspin01 psxspin02 psxsysconf psxtime psxtimer01 \ + psxtimer02 psxualarm \ + psxfatal01 psxfatal02 \ + psxintrcritical01 ## File IO tests SUBDIRS += psxfile01 psxreaddir psxstat psxmount psx13 psxchroot01 diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac index 0d08507faa..bb75516440 100644 --- a/testsuites/psxtests/configure.ac +++ b/testsuites/psxtests/configure.ac @@ -52,6 +52,7 @@ psxfatal01/Makefile psxfatal02/Makefile psxfile01/Makefile psxhdrs/Makefile +psxintrcritical01/Makefile psxitimer/Makefile psxkey01/Makefile psxmount/Makefile diff --git a/testsuites/psxtests/psxintrcritical01/.cvsignore b/testsuites/psxtests/psxintrcritical01/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/psxtests/psxintrcritical01/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/psxtests/psxintrcritical01/Makefile.am b/testsuites/psxtests/psxintrcritical01/Makefile.am new file mode 100644 index 0000000000..86d8d0d7f1 --- /dev/null +++ b/testsuites/psxtests/psxintrcritical01/Makefile.am @@ -0,0 +1,30 @@ +## +## $Id$ +## + +MANAGERS = all + +rtems_tests_PROGRAMS = psxintrcritical01 +psxintrcritical01_SOURCES = init.c \ + ../../sptests/spintrcritical_support/intrcritical.c + +dist_rtems_tests_DATA = psxintrcritical01.scn +dist_rtems_tests_DATA += psxintrcritical01.doc + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../automake/compile.am +include $(top_srcdir)/../automake/leaf.am + +psxintrcritical01_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) + +AM_CPPFLAGS += -I$(top_srcdir)/../support/include +AM_CPPFLAGS += -I$(top_srcdir)/../sptests/spintrcritical_support + +LINK_OBJS = $(psxintrcritical01_OBJECTS) $(psxintrcritical01_LDADD) +LINK_LIBS = $(psxintrcritical01_LDLIBS) + +psxintrcritical01$(EXEEXT): $(psxintrcritical01_OBJECTS) $(psxintrcritical01_DEPENDENCIES) + @rm -f psxintrcritical01$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/psxtests/psxintrcritical01/init.c b/testsuites/psxtests/psxintrcritical01/init.c new file mode 100644 index 0000000000..bece2088b3 --- /dev/null +++ b/testsuites/psxtests/psxintrcritical01/init.c @@ -0,0 +1,93 @@ +/* + * 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 <tmacros.h> +#include <intrcritical.h> +#include <time.h> + +#define TEST_NAME "01" +#define TEST_STRING "POSIX Timer" + +rtems_id Main_task; +timer_t Timer; +struct itimerspec TimerParams; + +#define POSIX_TIMER_RELATIVE 0 + +rtems_timer_service_routine test_release_from_isr( + rtems_id timer, + void *arg +) +{ + (void) timer_settime(Timer, POSIX_TIMER_RELATIVE, &TimerParams, NULL); +} + +rtems_task Init( + rtems_task_argument ignored +) +{ + int sc; + int resets; + + puts( "\n\n*** TEST POSIX INTERRUPT CRITICAL SECTION " TEST_NAME " ***" ); + + puts( "Init - Trying to generate timer fire from ISR while firing" ); + puts( "Init - Variation is: " TEST_STRING ); + + puts( "Init - There is no way for the test to know if it hits the case" ); + + /* create POSIX Timer */ + sc = timer_create (CLOCK_REALTIME, NULL, &Timer); + if ( sc == -1 ) { + perror ("Error in timer creation\n"); + rtems_test_exit(0); + } + + Main_task = rtems_task_self(); + + /* we don't care if it ever fires */ + TimerParams.it_interval.tv_sec = 10; + TimerParams.it_interval.tv_nsec = 0; + TimerParams.it_value.tv_sec = 10; + TimerParams.it_value.tv_nsec = 0; + + interrupt_critical_section_test_support_initialize( test_release_from_isr ); + + for (resets=0 ; resets<10 ;) { + if ( interrupt_critical_section_test_support_delay() ) + resets++; + + sc = timer_settime(Timer, POSIX_TIMER_RELATIVE, &TimerParams, NULL); + if ( sc == -1 ) { + perror ("Error in timer setting\n"); + rtems_test_exit(0); + } + + } + + puts( "*** END OF TEST POSIX INTERRUPT CRITICAL SECTION " TEST_NAME " ***" ); + rtems_test_exit(0); +} + +/* configuration information */ + +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 1 +#define CONFIGURE_MAXIMUM_TIMERS 1 +#define CONFIGURE_MAXIMUM_POSIX_TIMERS 1 +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_INIT +#include <rtems/confdefs.h> + +/* global variables */ diff --git a/testsuites/psxtests/psxintrcritical01/psxintrcritical01.doc b/testsuites/psxtests/psxintrcritical01/psxintrcritical01.doc new file mode 100644 index 0000000000..669d40ceb7 --- /dev/null +++ b/testsuites/psxtests/psxintrcritical01/psxintrcritical01.doc @@ -0,0 +1,24 @@ +# +# $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: psxintrcritical01 + +directives: + + timer_settime + timer_create + +concepts: + ++ Ensure that rescheduling a timer from an ISR while it is being scheduled + from a thread using timer_settime works as expected. diff --git a/testsuites/psxtests/psxintrcritical01/psxintrcritical01.scn b/testsuites/psxtests/psxintrcritical01/psxintrcritical01.scn new file mode 100644 index 0000000000..d9f90364a7 --- /dev/null +++ b/testsuites/psxtests/psxintrcritical01/psxintrcritical01.scn @@ -0,0 +1,5 @@ +*** TEST POSIX INTERRUPT CRITICAL SECTION 01 *** +Init - Trying to generate timer fire from ISR while firing +Init - Variation is: POSIX Timer +Init - There is no way for the test to know if it hits the case +Support - rtems_timer_create - creating timer 1 |