Changeset cdcea6ce in rtems

Timestamp:

08/12/96 17:21:04 (27 years ago)

Author:

Mark Johannes <Mark.Johannes@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

af04a791

Parents:

f126ae2

Message:

_POSIX_Condition_variables_Signal_support: added setting mutex back to NULL

if the queue has been emptied of waiting tasks.

_POSIX_Condition_variables_Wait_support: added error check for different mutexesfor the same condition variable. Also added _Thread_queue_Enter_critical_section

Files:

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

c/src/exec/posix/src/cond.c

@@ -200 +200 @@
   the_cond->process_shared  = the_attr->process_shared;
 
-  the_cond->Mutex = 0;
+  the_cond->Mutex = (unsigned32) NULL;
 
 /* XXX some more initialization might need to go here */
@@ -315 +315 @@
       do { 
         the_thread = _Thread_queue_Dequeue( &the_cond->Wait_queue );
+        if ( !the_thread )
+          the_cond->Mutex = (unsigned32) NULL;
       } while ( is_broadcast && the_thread );
       return 0;
@@ -373 +375 @@
     case OBJECTS_LOCAL:
  
-      /*
-       *  XXX: should be an error if cond->Mutex != mutex
-       */
+      if ( the_cond->Mutex && ( the_cond->Mutex != *mutex ) )
+        return EINVAL;
  
       status = pthread_mutex_unlock( mutex );
@@ -383 +384 @@
       the_cond->Mutex = *mutex;
  
-/* XXX .. enter critical section .. */
+      _Thread_queue_Enter_critical_section( &the_cond->Wait_queue );
+
       _Thread_queue_Enqueue( &the_cond->Wait_queue, 0 );
 

cpukit/posix/src/cond.c

@@ -200 +200 @@
   the_cond->process_shared  = the_attr->process_shared;
 
-  the_cond->Mutex = 0;
+  the_cond->Mutex = (unsigned32) NULL;
 
 /* XXX some more initialization might need to go here */
@@ -315 +315 @@
       do { 
         the_thread = _Thread_queue_Dequeue( &the_cond->Wait_queue );
+        if ( !the_thread )
+          the_cond->Mutex = (unsigned32) NULL;
       } while ( is_broadcast && the_thread );
       return 0;
@@ -373 +375 @@
     case OBJECTS_LOCAL:
  
-      /*
-       *  XXX: should be an error if cond->Mutex != mutex
-       */
+      if ( the_cond->Mutex && ( the_cond->Mutex != *mutex ) )
+        return EINVAL;
  
       status = pthread_mutex_unlock( mutex );
@@ -383 +384 @@
       the_cond->Mutex = *mutex;
  
-/* XXX .. enter critical section .. */
+      _Thread_queue_Enter_critical_section( &the_cond->Wait_queue );
+
       _Thread_queue_Enqueue( &the_cond->Wait_queue, 0 );