Changeset c0bc189 in mainline for generic/src/synch/condvar.c

Timestamp:

2006-05-19T11:55:55Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7633b109

Parents:

35f3b8c

Message:

Fix race in condition variables.

File:

• generic/src/synch/condvar.c (modified) (5 diffs)

generic/src/synch/condvar.c

@@ -36 +36 @@
 #include <synch/waitq.h>
 #include <synch/synch.h>
+#include <arch.h>
+#include <typedefs.h>
 
-/** Initialize condition variable
- *
- * Initialize condition variable.
+/** Initialize condition variable.
  *
  * @param cv Condition variable.
@@ -48 +48 @@
 }
 
-/** Signal the condition has become true
- *
+/**
  * Signal the condition has become true
  * to the first waiting thread by waking it up.
@@ -60 +59 @@
 }
 
-/** Signal the condition has become true
- *
+/**
  * Signal the condition has become true
  * to all waiting threads by waking them up.
@@ -72 +70 @@
 }
 
-/** Wait for the condition becoming true
- *
- * Wait for the condition becoming true.
+/** Wait for the condition becoming true.
  *
  * @param cv Condition variable.
@@ -89 +85 @@
 {
         int rc;
+        ipl_t ipl;
 
+        ipl = waitq_sleep_prepare(&cv->wq);
         mutex_unlock(mtx);
-        rc = waitq_sleep_timeout(&cv->wq, usec, trywait);
+        
+        rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, trywait);
+
         mutex_lock(mtx);
+        waitq_sleep_finish(&cv->wq, rc, ipl);
+
         return rc;
 }