Changeset baafe71 in mainline

Timestamp:

2006-05-25T10:04:05Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fd4d8c0

Parents:

47800e0

Message:

Make implementation of condition variables compliant with their definition.
Signal operation must become a no-op if there is no thread in the wait operation.
Remove condvar_trywait() which has no meaning after this change.

Location:

generic

Files:

• include/synch/condvar.h (modified) (1 diff)
• src/synch/condvar.c (modified) (2 diffs)

generic/include/synch/condvar.h

@@ -40 +40 @@
 
 #define condvar_wait(cv,mtx) \
-        _condvar_wait_timeout((cv),(mtx),SYNCH_NO_TIMEOUT,SYNCH_BLOCKING)
-#define condvar_trywait(cv,mtx) \
-        _condvar_wait_timeout((cv),(mtx),SYNCH_NO_TIMEOUT,SYNCH_NON_BLOCKING)
+        _condvar_wait_timeout((cv),(mtx),SYNCH_NO_TIMEOUT)
 #define condvar_wait_timeout(cv,mtx,usec) \
-        _condvar_wait_timeout((cv),(mtx),(usec),SYNCH_NON_BLOCKING)
+        _condvar_wait_timeout((cv),(mtx),(usec))
 
 extern void condvar_initialize(condvar_t *cv);
 extern void condvar_signal(condvar_t *cv);
 extern void condvar_broadcast(condvar_t *cv);
-extern int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, __u32 usec, int trywait);
+extern int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, __u32 usec);
 
 #endif

generic/src/synch/condvar.c

@@ -75 +75 @@
  * @param mtx Mutex.
  * @param usec Timeout value in microseconds.
- * @param trywait Blocking versus non-blocking operation mode switch.
  *
- * For exact description of possible combinations of
- * usec and trywait, see comment for waitq_sleep_timeout().
+ * For exact description of meaning of possible values of usec,
+ * see comment for waitq_sleep_timeout().
  *
  * @return See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, __u32 usec, int trywait)
+int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, __u32 usec)
 {
         int rc;
@@ -89 +88 @@
         ipl = waitq_sleep_prepare(&cv->wq);
         mutex_unlock(mtx);
-        
-        rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, trywait);
+
+        cv->wq.missed_wakeups = 0;      /* Enforce blocking. */
+        rc = waitq_sleep_timeout_unsafe(&cv->wq, usec, SYNCH_BLOCKING);
 
         mutex_lock(mtx);