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

Timestamp:

2010-05-09T10:47:48Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5e984f2, e2fcdb1

Parents:

640ffe6

Message:

Add assertion to detect attempts to block when hodling a spinlock.

File:

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

kernel/generic/src/synch/waitq.c

@@ -208 +208 @@
 }
 
+#define PARAM_NON_BLOCKING(flags, usec) \
+        (((flags) & SYNCH_FLAGS_NON_BLOCKING) && ((usec) == 0))
+
 /** Sleep until either wakeup, timeout or interruption occurs
  *
@@ -257 +260 @@
         ipl_t ipl;
         int rc;
+
+        ASSERT(!PREEMPTION_DISABLED || PARAM_NON_BLOCKING(flags, usec));
         
         ipl = waitq_sleep_prepare(wq);
@@ -344 +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;