Changeset bc7d44c in mainline for kernel/generic/include

Timestamp:

2009-08-21T07:33:36Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

af8e565

Parents:

b9c7425 (diff), 207e208e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge fibril synchronization improvements.

Location:

kernel/generic/include

Files:

• ipc/sysipc.h (modified) (1 diff)
• synch/waitq.h (modified) (1 diff)
• syscall/syscall.h (modified) (1 diff)

kernel/generic/include/ipc/sysipc.h

@@ -52 +52 @@
 unative_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
     int nonblocking);
+unative_t sys_ipc_poke(void);
 unative_t sys_ipc_forward_fast(unative_t callid, unative_t phoneid,
     unative_t method, unative_t arg1, unative_t arg2, int mode);

kernel/generic/include/synch/waitq.h

@@ -68 +68 @@
 struct thread;
 
-extern void waitq_initialize(waitq_t *wq);
-extern int waitq_sleep_timeout(waitq_t *wq, uint32_t usec, int flags);
-extern ipl_t waitq_sleep_prepare(waitq_t *wq);
-extern int waitq_sleep_timeout_unsafe(waitq_t *wq, uint32_t usec, int flags);
-extern void waitq_sleep_finish(waitq_t *wq, int rc, ipl_t ipl);
-extern void waitq_wakeup(waitq_t *wq, wakeup_mode_t mode);
-extern void _waitq_wakeup_unsafe(waitq_t *wq, wakeup_mode_t mode);
-extern void waitq_interrupt_sleep(struct thread *t);
+extern void waitq_initialize(waitq_t *);
+extern int waitq_sleep_timeout(waitq_t *, uint32_t, int);
+extern ipl_t waitq_sleep_prepare(waitq_t *);
+extern int waitq_sleep_timeout_unsafe(waitq_t *, uint32_t, int);
+extern void waitq_sleep_finish(waitq_t *, int, ipl_t);
+extern void waitq_wakeup(waitq_t *, wakeup_mode_t);
+extern void _waitq_wakeup_unsafe(waitq_t *, wakeup_mode_t);
+extern void waitq_interrupt_sleep(struct thread *);
+extern void waitq_unsleep(waitq_t *);
 
 #endif

kernel/generic/include/syscall/syscall.h

@@ -66 +66 @@
         SYS_IPC_FORWARD_SLOW,
         SYS_IPC_WAIT,
+        SYS_IPC_POKE,
         SYS_IPC_HANGUP,
         SYS_IPC_REGISTER_IRQ,