Changeset 76f03c6 in rtems for cpukit/posix/src/cond.c

Timestamp:

08/13/96 19:03:29 (26 years ago)

Author:

Mark Johannes <Mark.Johannes@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

c9c94387

Parents:

b2e8026

Message:

_POSIX_Condition_variables_Wait_support: fixed the timeout sequence.

File:

• cpukit/posix/src/cond.c (modified) (3 diffs)

cpukit/posix/src/cond.c

@@ -201 +201 @@
   the_cond->process_shared  = the_attr->process_shared;
 
-  the_cond->Mutex = (unsigned32) NULL;
+  the_cond->Mutex = POSIX_CONDITION_VARIABLES_NO_MUTEX;
 
 /* XXX some more initialization might need to go here */
@@ -317 +317 @@
         the_thread = _Thread_queue_Dequeue( &the_cond->Wait_queue );
         if ( !the_thread )
-          the_cond->Mutex = (unsigned32) NULL;
+          the_cond->Mutex = POSIX_CONDITION_VARIABLES_NO_MUTEX;
       } while ( is_broadcast && the_thread );
+
+      _Thread_Enable_dispatch();
+
       return 0;
   }
@@ -376 +379 @@
     case OBJECTS_LOCAL:
  
-      if ( the_cond->Mutex && ( the_cond->Mutex != *mutex ) )
+      if ( the_cond->Mutex && ( the_cond->Mutex != *mutex ) ) {
+        _Thread_Enable_dispatch();
         return EINVAL;
+      }
+ 
+      the_cond->Mutex = *mutex;
  
       status = pthread_mutex_unlock( mutex );
-      if ( status )
+      if ( status ) {
+        _Thread_Enable_dispatch();
         return status;
- 
-      the_cond->Mutex = *mutex;
+      }
  
       _Thread_queue_Enter_critical_section( &the_cond->Wait_queue );
-
-      _Thread_queue_Enqueue( &the_cond->Wait_queue, 0 );
+      _Thread_Executing->Wait.return_code = 0;
+      _Thread_Executing->Wait.queue       = &the_cond->Wait_queue;
+      _Thread_Executing->Wait.id          = *cond;
+
+      _Thread_queue_Enqueue( &the_cond->Wait_queue, timeout );
 
       _Thread_Enable_dispatch();
+
+      /*
+       *  Switch ourself out because we blocked as a result of the 
+       *  _Thread_queue_Enqueue.
+       */
+
+      if ( _Thread_Executing->Wait.return_code )
+        return _Thread_Executing->Wait.return_code;
 
       status = pthread_mutex_lock( mutex );