diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-31 22:40:53 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-31 22:40:53 +0000 |
commit | eaad7ce07840beb7882dc3057fd44c0e5c5c9c08 (patch) | |
tree | 3b72b19d2509246506d672acf1dd5c6799d38a19 | |
parent | 426eb35f03997f983b0fed547b6e4b2750840292 (diff) |
2011-07-31 Joel Sherrill <joel.sherrilL@OARcorp.com>
PR 1855/cpukit
* Makefile.am, configure.ac: Correct signal processing during
pthread_join. We are supposed to unblock the thread waiting on a
pthread_join(), dispatch the signal handler, account for it
potentially overwriting errno, and then have the thread return to
blocking within pthread_join().
* psxeintr_join/.cvsignore, psxeintr_join/Makefile.am,
psxeintr_join/init.c, psxeintr_join/psxeintr_join.doc,
psxeintr_join/psxeintr_join.scn: New files.
-rw-r--r-- | testsuites/psxtests/ChangeLog | 12 | ||||
-rw-r--r-- | testsuites/psxtests/Makefile.am | 2 | ||||
-rw-r--r-- | testsuites/psxtests/configure.ac | 1 | ||||
-rw-r--r-- | testsuites/psxtests/psxeintr_join/.cvsignore | 2 | ||||
-rw-r--r-- | testsuites/psxtests/psxeintr_join/Makefile.am | 25 | ||||
-rw-r--r-- | testsuites/psxtests/psxeintr_join/init.c | 125 | ||||
-rw-r--r-- | testsuites/psxtests/psxeintr_join/psxeintr_join.doc | 24 | ||||
-rw-r--r-- | testsuites/psxtests/psxeintr_join/psxeintr_join.scn | 9 |
8 files changed, 199 insertions, 1 deletions
diff --git a/testsuites/psxtests/ChangeLog b/testsuites/psxtests/ChangeLog index 36625b52ec..6c583d8082 100644 --- a/testsuites/psxtests/ChangeLog +++ b/testsuites/psxtests/ChangeLog @@ -1,5 +1,17 @@ 2011-07-31 Joel Sherrill <joel.sherrilL@OARcorp.com> + PR 1855/cpukit + * Makefile.am, configure.ac: Correct signal processing during + pthread_join. We are supposed to unblock the thread waiting on a + pthread_join(), dispatch the signal handler, account for it + potentially overwriting errno, and then have the thread return to + blocking within pthread_join(). + * psxeintr_join/.cvsignore, psxeintr_join/Makefile.am, + psxeintr_join/init.c, psxeintr_join/psxeintr_join.doc, + psxeintr_join/psxeintr_join.scn: New files. + +2011-07-31 Joel Sherrill <joel.sherrilL@OARcorp.com> + PR 1867/cpukit * Makefile.am, configure.ac, psx12/task.c, psxkey03/init.c, psxrwlock01/test.c: Correct implementation of pthread_exit() and diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am index 5acb1789f1..b2bfb87c98 100644 --- a/testsuites/psxtests/Makefile.am +++ b/testsuites/psxtests/Makefile.am @@ -15,7 +15,7 @@ SUBDIRS += psxhdrs psx01 psx02 psx03 psx04 psx05 psx06 psx07 psx08 psx09 \ psxmutexattr01 psxobj01 psxrwlock01 psxsem01 psxsignal01 psxsignal02 \ psxsignal03 psxsignal04 psxsignal05 psxspin01 psxspin02 psxsysconf \ psxtime psxtimer01 psxtimer02 psxualarm psxusleep psxfatal01 psxfatal02 \ - psxintrcritical01 psxstack01 + psxintrcritical01 psxstack01 psxeintr_join endif ## File IO tests diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac index bf527e1980..d4ea0810b6 100644 --- a/testsuites/psxtests/configure.ac +++ b/testsuites/psxtests/configure.ac @@ -86,6 +86,7 @@ psxcleanup/Makefile psxcleanup01/Makefile psxclock/Makefile psxcond01/Makefile +psxeintr_join/Makefile psxenosys/Makefile psxfatal01/Makefile psxfatal02/Makefile diff --git a/testsuites/psxtests/psxeintr_join/.cvsignore b/testsuites/psxtests/psxeintr_join/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/psxtests/psxeintr_join/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/psxtests/psxeintr_join/Makefile.am b/testsuites/psxtests/psxeintr_join/Makefile.am new file mode 100644 index 0000000000..cb1e0f171c --- /dev/null +++ b/testsuites/psxtests/psxeintr_join/Makefile.am @@ -0,0 +1,25 @@ +## +## $Id$ +## + +rtems_tests_PROGRAMS = psxeintr_join +psxeintr_join_SOURCES = init.c + +dist_rtems_tests_DATA = psxeintr_join.scn +dist_rtems_tests_DATA += psxeintr_join.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)/include +AM_CPPFLAGS += -I$(top_srcdir)/../support/include + +LINK_OBJS = $(psxeintr_join_OBJECTS) $(psxeintr_join_LDADD) +LINK_LIBS = $(psxeintr_join_LDLIBS) + +psxeintr_join$(EXEEXT): $(psxeintr_join_OBJECTS) $(psxeintr_join_DEPENDENCIES) + @rm -f psxeintr_join$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/psxtests/psxeintr_join/init.c b/testsuites/psxtests/psxeintr_join/init.c new file mode 100644 index 0000000000..9bf3c2a882 --- /dev/null +++ b/testsuites/psxtests/psxeintr_join/init.c @@ -0,0 +1,125 @@ +/* + * COPYRIGHT (c) 1989-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$ + */ + +#include <stdio.h> +#include <signal.h> +#include <semaphore.h> +#include <pthread.h> + +#include <rtems.h> +#include <tmacros.h> +#include "test_support.h" + +#define SIG_SUSPEND SIGUSR1 +#define SIG_THR_RESTART SIGUSR2 + +sem_t GC_suspend_ack_sem; + +static void print_sig_mask( const char * str ) +{ + sigset_t blocked; + int i; + int status; + + status = pthread_sigmask( SIG_BLOCK, NULL, &blocked ); + rtems_test_assert( status == 0 ); + + printf( "%s blocked:\n", str ); + for ( i = 1; i < NSIG; i++) { + if ( sigismember( &blocked, i ) ) + printf( "%d ", i ); + } + printf( "\n" ); +} + +void GC_suspend_handler( int sig ) +{ + puts( "run in GC_suspend_handler" ); + sem_post( &GC_suspend_ack_sem ); +} + +void GC_restart_handler( int sig ) +{ + puts( "run in GC_restart_handler" ); +} + +void* run( void *arg ) +{ + int status; + pthread_t id = *(pthread_t *)arg; + + print_sig_mask( "New Thread" ); + + status = pthread_kill( id, SIG_SUSPEND ); + rtems_test_assert( status == 0 ); + + puts( "New Thread: after pthread_kill" ); + status = sem_wait( &GC_suspend_ack_sem ); + rtems_test_assert( status == 0 ); + + puts( "New Thread over!" ); + return NULL; +} + +void *POSIX_Init( void *arg ) +{ + struct sigaction act; + pthread_t newThread; + pthread_t mainThread; + int status; + + puts( "*** POSIX TEST PSXEINTR_JOIN ***" ); + status = sem_init( &GC_suspend_ack_sem, 0, 0); + rtems_test_assert( status == 0 ); + + status = sigemptyset( &act.sa_mask ); + rtems_test_assert( status == 0 ); + + status = sigaddset( &act.sa_mask, SIG_SUSPEND ); + rtems_test_assert( status == 0 ); + + status = pthread_sigmask( SIG_UNBLOCK, &act.sa_mask, NULL ); + rtems_test_assert( status == 0 ); + + act.sa_handler = GC_suspend_handler; + + status = sigaction( SIG_SUSPEND, &act, NULL ); + rtems_test_assert( status == 0 ); + + act.sa_handler = GC_restart_handler; + + print_sig_mask( "Main Thread" ); + + mainThread = pthread_self(); + status = pthread_create( &newThread, NULL, run, &mainThread ); + rtems_test_assert( status == 0 ); + + pthread_join( newThread, NULL ); + puts( "Back from pthread_join" ); + + puts( "*** END OF POSIX TEST PSXEINTR_JOIN ***" ); + rtems_test_exit( 0 ); + + return NULL; +} + +/* configuration information */ +#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_POSIX_INIT_THREAD_TABLE +#define CONFIGURE_MAXIMUM_POSIX_THREADS 2 +#define CONFIGURE_MAXIMUM_POSIX_SEMAPHORES 1 + +#define CONFIGURE_INIT +#include <rtems/confdefs.h> +/* end of file */ + diff --git a/testsuites/psxtests/psxeintr_join/psxeintr_join.doc b/testsuites/psxtests/psxeintr_join/psxeintr_join.doc new file mode 100644 index 0000000000..92702eada3 --- /dev/null +++ b/testsuites/psxtests/psxeintr_join/psxeintr_join.doc @@ -0,0 +1,24 @@ +# +# $Id$ +# +# COPYRIGHT (c) 1989-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: psxeintr_join + +directives: + + + pthread_join + + pthread_kill + +concepts: + ++ Verify that a signal sent during a blocking pthread_join() call is properly + processed. diff --git a/testsuites/psxtests/psxeintr_join/psxeintr_join.scn b/testsuites/psxtests/psxeintr_join/psxeintr_join.scn new file mode 100644 index 0000000000..d6e182054e --- /dev/null +++ b/testsuites/psxtests/psxeintr_join/psxeintr_join.scn @@ -0,0 +1,9 @@ +*** POSIX TEST PSXEINTR_JOIN *** +Main Thread blocked: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 27 28 29 30 31 +New Thread blocked: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 27 28 29 30 31 +New Thread: after pthread_kill +run in GC_suspend_handler +New Thread over! +Back from pthread_join +*** END OF POSIX TEST PSXEINTR_JOIN *** + |