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

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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) (3 diffs)

kernel/generic/src/synch/waitq.c

@@ -54 +54 @@
 #include <context.h>
 #include <adt/list.h>
+#include <arch/cycle.h>
 
 static void waitq_sleep_timed_out(void *data);
@@ -373 +374 @@
                 if (!context_save(&THREAD->sleep_interruption_context)) {
                         /* Short emulation of scheduler() return code. */
+                        THREAD->last_cycle = get_cycle();
                         spinlock_unlock(&THREAD->lock);
                         return ESYNCH_INTERRUPTED;
@@ -385 +387 @@
                 if (!context_save(&THREAD->sleep_timeout_context)) {
                         /* Short emulation of scheduler() return code. */
+                        THREAD->last_cycle = get_cycle();
                         spinlock_unlock(&THREAD->lock);
                         return ESYNCH_TIMEOUT;