Changeset 116d1ef4 in mainline for generic/include/synch/rwlock.h

Timestamp:

2006-06-02T12:26:50Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d0c5901

Parents:

01ebbdf

Message:

Replace nonblocking argument of waitq_sleep_timeout with flags that specify mode of operation.
Now a flag can be used to specify interruptible sleep.
Modify waitq_interrupt_sleep() to only interrupt threads that used this flag.
O

File:

• generic/include/synch/rwlock.h (modified) (1 diff)

generic/include/synch/rwlock.h

@@ -49 +49 @@
 
 #define rwlock_write_lock(rwl) \
-        _rwlock_write_lock_timeout((rwl),SYNCH_NO_TIMEOUT,SYNCH_BLOCKING)
+        _rwlock_write_lock_timeout((rwl),SYNCH_NO_TIMEOUT,SYNCH_FLAGS_NONE)
 #define rwlock_read_lock(rwl) \
-        _rwlock_read_lock_timeout((rwl),SYNCH_NO_TIMEOUT,SYNCH_BLOCKING)
+        _rwlock_read_lock_timeout((rwl),SYNCH_NO_TIMEOUT,SYNCH_FLAGS_NONE)
 #define rwlock_write_trylock(rwl) \
-        _rwlock_write_lock_timeout((rwl),SYNCH_NO_TIMEOUT,SYNCH_NON_BLOCKING)
+        _rwlock_write_lock_timeout((rwl),SYNCH_NO_TIMEOUT,SYNCH_FLAGS_NON_BLOCKING)
 #define rwlock_read_trylock(rwl) \
-        _rwlock_read_lock_timeout((rwl),SYNCH_NO_TIMEOUT,SYNCH_NON_BLOCKING)
+        _rwlock_read_lock_timeout((rwl),SYNCH_NO_TIMEOUT,SYNCH_FLAGS_NON_BLOCKING)
 #define rwlock_write_lock_timeout(rwl,usec) \
-        _rwlock_write_lock_timeout((rwl),(usec),SYNCH_NON_BLOCKING)
+        _rwlock_write_lock_timeout((rwl),(usec),SYNCH_FLAGS_NONE)
 #define rwlock_read_lock_timeout(rwl,usec) \
-        _rwlock_read_lock_timeout((rwl),(usec),SYNCH_NON_BLOCKING)
+        _rwlock_read_lock_timeout((rwl),(usec),SYNCH_FLAGS_NONE)
 
 extern void rwlock_initialize(rwlock_t *rwl);
 extern void rwlock_read_unlock(rwlock_t *rwl);
 extern void rwlock_write_unlock(rwlock_t *rwl);
-extern int _rwlock_read_lock_timeout(rwlock_t *rwl, __u32 usec, int trylock);
-extern int _rwlock_write_lock_timeout(rwlock_t *rwl, __u32 usec, int trylock);
+extern int _rwlock_read_lock_timeout(rwlock_t *rwl, __u32 usec, int flags);
+extern int _rwlock_write_lock_timeout(rwlock_t *rwl, __u32 usec, int flags);
 
 #endif
+