Ticket #1855: pr1855_411.diff

cpukit/posix/src/psignal.c

@@ -112 +112 @@
   POSIX_API_Control  *api;
   int                 signo;
   ISR_Level           level;
+  int                 hold_errno;
 
   api = the_thread->API_Extensions[ THREAD_API_POSIX ];
 
   /*
+   *  We need to ensure that if the signal handler executes a call
+   *  which overwrites the unblocking status, we restore it.
+   */
+  hold_errno = _Thread_Executing->Wait.return_code;
+
+  /*
    * api may be NULL in case of a thread close in progress
    */
   if ( !api )
@@ -149 +156 @@
       _POSIX_signals_Check_signal( api, signo, true );
     }
   }
+
+  _Thread_Executing->Wait.return_code = hold_errno;
 }
 
 /*

cpukit/posix/src/pthread.c

@@ -217 +217 @@
   _Thread_queue_Initialize(
     &api->Join_List,
     THREAD_QUEUE_DISCIPLINE_FIFO,
-    STATES_WAITING_FOR_JOIN_AT_EXIT,
+    STATES_WAITING_FOR_JOIN_AT_EXIT | STATES_INTERRUPTIBLE_BY_SIGNAL,
     0
   );
 

cpukit/posix/src/pthreadjoin.c

@@ -1 +1 @@
 /*
  *  16.1.3 Wait for Thread Termination, P1003.1c/Draft 10, p. 147
  *
- *  COPYRIGHT (c) 1989-2007.
+ *  COPYRIGHT (c) 1989-2011.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -32 +32 @@
   Objects_Locations        location;
   void                    *return_pointer;
 
+on_EINTR:
   the_thread = _Thread_Get( thread, &location );
   switch ( location ) {
 
@@ -66 +67 @@
       }
       _Thread_Enable_dispatch();
 
+      if ( _Thread_Executing->Wait.return_code == EINTR )
+        goto on_EINTR;
+
       if ( value_ptr )
         *value_ptr = return_pointer;
       return 0;

testsuites/psxtests/Makefile.am

@@ -17 +17 @@
     psxsignal03 psxsignal04 psxsignal05 psxsignal06 \
     psxspin01 psxspin02 psxsysconf \
     psxtime psxtimer01 psxtimer02 psxualarm psxusleep psxfatal01 psxfatal02 \
-    psxintrcritical01 psxstack01 psxstack02
+    psxintrcritical01 psxstack01 psxstack02 \
+    psxeintr_join
 endif
 
 ## File IO tests

testsuites/psxtests/configure.ac

@@ -112 +112 @@
 psxcleanup01/Makefile
 psxclock/Makefile
 psxcond01/Makefile
+psxeintr_join/Makefile
 psxenosys/Makefile
 psxfatal01/Makefile
 psxfatal02/Makefile

new file testsuites/psxtests/psxeintr_join/.cvsignore

@@ +1 @@
+Makefile
+Makefile.in

new file testsuites/psxtests/psxeintr_join/Makefile.am

@@ +1 @@
+##
+## $Id: Makefile.am,v 1.1 2010/11/05 19:33:03 joel Exp $
+##
+
+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

new file testsuites/psxtests/psxeintr_join/init.c

@@ +1 @@
+/*
+ *  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 */
+

new file testsuites/psxtests/psxeintr_join/psxeintr_join.doc

@@ +1 @@
+#
+#  $Id: TEST.doc,v 1.1 2010/06/21 12:37:11 joel Exp $
+#
+#  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.

new file testsuites/psxtests/psxeintr_join/psxeintr_join.scn

@@ +1 @@
+*** 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 ***
+