Changeset 203f4c3 in mainline for generic/include

Timestamp:

2006-04-09T14:14:49Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

016acbe

Parents:

fe04594

Message:

Sleeping in a wait queue can be now interrupted with
waitq_interrupt_sleep().

Location:

generic/include

Files:

• proc/thread.h (modified) (1 diff)
• synch/synch.h (modified) (1 diff)
• synch/waitq.h (modified) (1 diff)

generic/include/proc/thread.h

@@ -81 +81 @@
         void *thread_arg;                       /**< Argument passed to thread_code() function. */
 
-        context_t saved_context;                /**< From here, the stored context is restored when the thread is scheduled. */
-        context_t sleep_timeout_context;        /**< From here, the stored failover context is restored when sleep times out. */
+        /** From here, the stored context is restored when the thread is scheduled. */
+        context_t saved_context;
+        /** From here, the stored timeout context is restored when sleep times out. */
+        context_t sleep_timeout_context;
+        /** From here, the stored interruption context is restored when sleep is interrupted. */
+        context_t sleep_interruption_context;
 
         waitq_t *sleep_queue;                   /**< Wait queue in which this thread sleeps. */

generic/include/synch/synch.h

@@ -36 +36 @@
 #define ESYNCH_WOULD_BLOCK      1       /**< Could not satisfy the request without going to sleep. */
 #define ESYNCH_TIMEOUT          2       /**< Timeout occurred. */
-#define ESYNCH_OK_ATOMIC        4       /**< Operation succeeded without sleeping. */
-#define ESYNCH_OK_BLOCKED       8       /**< Operation succeeded and did sleep. */
+#define ESYNCH_INTERRUPTED      4       /**< Sleep was interrupted. */
+#define ESYNCH_OK_ATOMIC        8       /**< Operation succeeded without sleeping. */
+#define ESYNCH_OK_BLOCKED       16      /**< Operation succeeded and did sleep. */
 
-#define SYNCH_FAILED(rc)        ((rc) & (ESYNCH_WOULD_BLOCK | ESYNCH_TIMEOUT))
+#define SYNCH_FAILED(rc)        ((rc) & (ESYNCH_WOULD_BLOCK | ESYNCH_TIMEOUT | ESYNCH_INTERRUPTED))
 #define SYNCH_OK(rc)            ((rc) & (ESYNCH_OK_ATOMIC | ESYNCH_OK_BLOCKED))
 

generic/include/synch/waitq.h

@@ -55 +55 @@
         waitq_sleep_timeout((wq),SYNCH_NO_TIMEOUT,SYNCH_BLOCKING)
 
-extern void waitq_interrupted_sleep(void *data);
-
 extern void waitq_initialize(waitq_t *wq);
 extern int waitq_sleep_timeout(waitq_t *wq, __u32 usec, int nonblocking);
 extern void waitq_wakeup(waitq_t *wq, bool all);
 extern void _waitq_wakeup_unsafe(waitq_t *wq, bool all);
+extern void waitq_interrupt_sleep(thread_t *t);
 
 #endif