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

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

• kernel/generic/src/synch/waitq.c (modified) (6 diffs)

kernel/generic/src/synch/waitq.c

@@ -49 +49 @@
 #include <proc/scheduler.h>
 #include <arch/asm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <time/timeout.h>
 #include <arch.h>
 #include <context.h>
 #include <adt/list.h>
+#include <arch/cycle.h>
 
 static void waitq_sleep_timed_out(void *data);
@@ -207 +208 @@
 }
 
+#define PARAM_NON_BLOCKING(flags, usec) \
+        (((flags) & SYNCH_FLAGS_NON_BLOCKING) && ((usec) == 0))
+
 /** Sleep until either wakeup, timeout or interruption occurs
  *
@@ -256 +260 @@
         ipl_t ipl;
         int rc;
+
+        ASSERT((!PREEMPTION_DISABLED) || (PARAM_NON_BLOCKING(flags, usec)));
         
         ipl = waitq_sleep_prepare(wq);
@@ -343 +349 @@
         }
         else {
-                if ((flags & SYNCH_FLAGS_NON_BLOCKING) && (usec == 0)) {
+                if (PARAM_NON_BLOCKING(flags, usec)) {
                         /* return immediatelly instead of going to sleep */
                         return ESYNCH_WOULD_BLOCK;
@@ -373 +379 @@
                 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 +392 @@
                 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;