Changeset c838e2f4 in rtems

Timestamp:

Jul 28, 2010, 8:39:48 PM (9 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.11, master

Children:

57c841e9

Parents:

ec6a5a1

Message:

2010-07-28 Vinu Rajashekhar <vinutheraj@…>

• posix/src/condinit.c, posix/src/condwaitsupp.c, posix/src/psignalunblockthread.c: Clean up some signal interruption code.

Location:

cpukit

Files:

• ChangeLog (modified) (1 diff)
• posix/src/condinit.c (modified) (2 diffs)
• posix/src/condwaitsupp.c (modified) (1 diff)
• posix/src/psignalunblockthread.c (modified) (1 diff)

cpukit/ChangeLog

@@ +1 @@
+2010-07-28      Vinu Rajashekhar <vinutheraj@gmail.com>
+
+        * posix/src/condinit.c, posix/src/condwaitsupp.c,
+        posix/src/psignalunblockthread.c: Clean up some signal interruption
+        code.
+
 2010-07-27      Joel Sherrill <joel.sherrill@oarcorp.com>
 

cpukit/posix/src/condinit.c

@@ -45 +45 @@
    *  Be careful about attributes when global!!!
    */
-
   if ( the_attr->process_shared == PTHREAD_PROCESS_SHARED )
     return EINVAL;
@@ -65 +64 @@
   the_cond->Mutex = POSIX_CONDITION_VARIABLES_NO_MUTEX;
 
-/* XXX some more initialization might need to go here */
   _Thread_queue_Initialize(
     &the_cond->Wait_queue,
     THREAD_QUEUE_DISCIPLINE_FIFO,
-    STATES_WAITING_FOR_CONDITION_VARIABLE,
+    STATES_WAITING_FOR_CONDITION_VARIABLE | STATES_INTERRUPTIBLE_BY_SIGNAL,
     ETIMEDOUT
   );

cpukit/posix/src/condwaitsupp.c

@@ -86 +86 @@
          */
 
+        /*
+         *  If the thread is interrupted, while in the thread queue, by
+         *  a POSIX signal, then pthread_cond_wait returns spuriously,
+         *  according to the POSIX standard. It means that pthread_cond_wait
+         *  returns a success status, except for the fact that it was not
+         *  woken up a pthread_cond_signal or a pthread_cond_broadcast.
+         */
         status = _Thread_Executing->Wait.return_code;
-        if ( status && status != ETIMEDOUT )
-          return status;
+        if ( status == EINTR )
+          status = 0;
 
       } else {

cpukit/posix/src/psignalunblockthread.c

@@ -102 +102 @@
       the_thread->Wait.return_code = EINTR;
       /*
-       *  At this time, there is no RTEMS API object which lets a task
-       *  block on a thread queue and be interruptible by a POSIX signal.
-       *  If an object class with that requirement is ever added, enable
-       *  this code.
+       *  In pthread_cond_wait, a thread will be blocking on a thread
+       *  queue, but is also interruptible by a POSIX signal.
        */
-      #if 0
         if ( _States_Is_waiting_on_thread_queue(the_thread->current_state) )
           _Thread_queue_Extract_with_proxy( the_thread );
-        else
-      #endif
-          if ( _States_Is_delaying(the_thread->current_state) ){
+        else if ( _States_Is_delaying(the_thread->current_state) ){
             if ( _Watchdog_Is_active( &the_thread->Timer ) )
               (void) _Watchdog_Remove( &the_thread->Timer );
             _Thread_Unblock( the_thread );
           }
+
     } else if ( the_thread->current_state == STATES_READY ) {
       if ( _ISR_Is_in_progress() && _Thread_Is_executing( the_thread ) )