Changeset 116d1ef4 in mainline for generic/src/synch/futex.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/futex.c (modified) (2 diffs)

generic/src/synch/futex.c

@@ -100 +100 @@
  * @param uaddr Userspace address of the futex counter.
  * @param usec If non-zero, number of microseconds this thread is willing to sleep.
- * @param trydown If usec is zero and trydown is non-zero, conditional operation will be attempted.
+ * @param flags Select mode of operation.
  *
  * @return One of ESYNCH_TIMEOUT, ESYNCH_OK_ATOMIC and ESYNCH_OK_BLOCKED. See synch.h.
  *         If there is no physical mapping for uaddr ENOENT is returned.
  */
-__native sys_futex_sleep_timeout(__address uaddr, __u32 usec, int trydown)
+__native sys_futex_sleep_timeout(__address uaddr, __u32 usec, int flags)
 {
         futex_t *futex;
@@ -131 +131 @@
         futex = futex_find(paddr);
         
-        return (__native) waitq_sleep_timeout(&futex->wq, usec, trydown);
+        return (__native) waitq_sleep_timeout(&futex->wq, usec, flags | SYNCH_FLAGS_INTERRUPTIBLE);
 }