Changeset 116d1ef4 in mainline for generic/src/synch/rwlock.c

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/src/synch/rwlock.c (modified) (5 diffs)

generic/src/synch/rwlock.c

@@ -90 +90 @@
  * @param rwl Reader/Writer lock.
  * @param usec Timeout in microseconds.
- * @param trylock Switches between blocking and non-blocking mode.
+ * @param flags Specify mode of operation.
  *
  * For exact description of possible combinations of
- * @usec and @trylock, see comment for waitq_sleep_timeout().
+ * usec and flags, see comment for waitq_sleep_timeout().
  *
  * @return See comment for waitq_sleep_timeout().
  */
-int _rwlock_write_lock_timeout(rwlock_t *rwl, __u32 usec, int trylock)
+int _rwlock_write_lock_timeout(rwlock_t *rwl, __u32 usec, int flags)
 {
         ipl_t ipl;
@@ -112 +112 @@
          * They just need to acquire the exclusive mutex.
          */
-        rc = _mutex_lock_timeout(&rwl->exclusive, usec, trylock);
+        rc = _mutex_lock_timeout(&rwl->exclusive, usec, flags);
         if (SYNCH_FAILED(rc)) {
 
                 /*
-                 * Lock operation timed out.
+                 * Lock operation timed out or was interrupted.
                  * The state of rwl is UNKNOWN at this point.
                  * No claims about its holder can be made.
@@ -144 +144 @@
  * @param rwl Reader/Writer lock.
  * @param usec Timeout in microseconds.
- * @param trylock Switches between blocking and non-blocking mode.
+ * @param flags Select mode of operation.
  *
  * For exact description of possible combinations of
- * usec and trylock, see comment for waitq_sleep_timeout().
+ * usec and flags, see comment for waitq_sleep_timeout().
  *
  * @return See comment for waitq_sleep_timeout().
  */
-int _rwlock_read_lock_timeout(rwlock_t *rwl, __u32 usec, int trylock)
+int _rwlock_read_lock_timeout(rwlock_t *rwl, __u32 usec, int flags)
 {
         int rc;
@@ -200 +200 @@
                 #endif
                                  
-                rc = _mutex_lock_timeout(&rwl->exclusive, usec, trylock);
+                rc = _mutex_lock_timeout(&rwl->exclusive, usec, flags);
                 switch (rc) {
                         case ESYNCH_WOULD_BLOCK:
@@ -209 +209 @@
                                 spinlock_unlock(&rwl->lock);
                         case ESYNCH_TIMEOUT:
+                        case ESYNCH_INTERRUPTED:
                                 /*
-                                 * The sleep timeouted.
+                                 * The sleep timed out.
                                  * We just restore interrupt priority level.
                                  */