Changeset b50b5af2 in mainline for kernel/generic/src/synch/waitq.c

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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 mainline changes.

File:

• kernel/generic/src/synch/waitq.c (modified) (1 diff)

kernel/generic/src/synch/waitq.c

@@ -171 +171 @@
 out:
         spinlock_unlock(&threads_lock);
+        interrupts_restore(ipl);
+}
+
+/** Interrupt the first thread sleeping in the wait queue.
+ *
+ * Note that the caller somehow needs to know that the thread to be interrupted
+ * is sleeping interruptibly.
+ *
+ * @param wq            Pointer to wait queue.
+ */
+void waitq_unsleep(waitq_t *wq)
+{
+        ipl_t ipl;
+
+        ipl = interrupts_disable();
+        spinlock_lock(&wq->lock);
+
+        if (!list_empty(&wq->head)) {
+                thread_t *t;
+                
+                t = list_get_instance(wq->head.next, thread_t, wq_link);
+                spinlock_lock(&t->lock);
+                ASSERT(t->sleep_interruptible);
+                if (t->timeout_pending && timeout_unregister(&t->sleep_timeout))
+                        t->timeout_pending = false;
+                list_remove(&t->wq_link);
+                t->saved_context = t->sleep_interruption_context;
+                t->sleep_queue = NULL;
+                spinlock_unlock(&t->lock);
+                thread_ready(t);
+        }
+
+        spinlock_unlock(&wq->lock);
         interrupts_restore(ipl);
 }