Changeset 2d22049 in mainline

Timestamp:

2006-06-02T12:29:08Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bd929cfb

Parents:

bf9afa07

Message:

Sync with last kernel commit (the ability to specify whether a sleep is interruptible or not).

Location:

libc

Files:

• generic/async.c (modified) (1 diff)
• generic/futex.c (modified) (3 diffs)
• generic/ipc.c (modified) (2 diffs)
• include/futex.h (modified) (1 diff)

libc/generic/async.c

@@ -508 +508 @@
                 futex_up(&async_futex);
 
-                callid = ipc_wait_cycle(&call, timeout, SYNCH_BLOCKING);
+                callid = ipc_wait_cycle(&call, timeout, SYNCH_FLAGS_NONE);
 
                 if (!callid) {

libc/generic/futex.c

@@ -82 +82 @@
 int futex_down(atomic_t *futex)
 {
-        return futex_down_timeout(futex, SYNCH_NO_TIMEOUT, SYNCH_BLOCKING);
+        return futex_down_timeout(futex, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE);
 }
 
 int futex_trydown(atomic_t *futex)
 {
-        return futex_down_timeout(futex, SYNCH_NO_TIMEOUT, SYNCH_NON_BLOCKING);
+        return futex_down_timeout(futex, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING);
 }
 
@@ -94 +94 @@
  * @param futex Futex.
  * @param usec Microseconds to wait. Zero value means sleep without timeout.
- * @param trydown If usec is zero and trydown is non-zero, only conditional
+ * @param flags Select mode of operation. See comment for waitq_sleep_timeout(). 
  *
  * @return ENOENT if there is no such virtual address. One of ESYNCH_OK_ATOMIC
@@ -101 +101 @@
  *         operation could not be carried out atomically (if requested so).
  */
-int futex_down_timeout(atomic_t *futex, uint32_t usec, int trydown)
+int futex_down_timeout(atomic_t *futex, uint32_t usec, int flags)
 {
         int rc;
         
         while (atomic_predec(futex) < 0) {
-                rc = __SYSCALL3(SYS_FUTEX_SLEEP, (sysarg_t) &futex->count, (sysarg_t) usec, (sysarg_t) trydown);
+                rc = __SYSCALL3(SYS_FUTEX_SLEEP, (sysarg_t) &futex->count, (sysarg_t) usec, (sysarg_t) flags);
                 
                 switch (rc) {

libc/generic/ipc.c

@@ -361 +361 @@
 
         do {
-                callid = ipc_wait_cycle(call, usec, SYNCH_BLOCKING);
+                callid = ipc_wait_cycle(call, usec, SYNCH_FLAGS_NONE);
         } while (callid & IPC_CALLID_ANSWERED);
 
@@ -378 +378 @@
 
         do {
-                callid = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT, SYNCH_NON_BLOCKING);
+                callid = ipc_wait_cycle(call, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NON_BLOCKING);
         } while (callid & IPC_CALLID_ANSWERED);
 

libc/include/futex.h

@@ -38 +38 @@
 extern int futex_down(atomic_t *futex);
 extern int futex_trydown(atomic_t *futex);
-extern int futex_down_timeout(atomic_t *futex, uint32_t usec, int trydown);
+extern int futex_down_timeout(atomic_t *futex, uint32_t usec, int flags);
 extern int futex_up(atomic_t *futex);