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

Timestamp:

2017-06-19T21:47:42Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

deacc58d

Parents:

7354b5e

Message:

ASSERT → assert

File:

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

kernel/generic/src/synch/waitq.c

@@ -44 +44 @@
  */
 
+#include <assert.h>
 #include <synch/waitq.h>
 #include <synch/spinlock.h>
@@ -203 +204 @@
                 irq_spinlock_lock(&thread->lock, false);
                 
-                ASSERT(thread->sleep_interruptible);
+                assert(thread->sleep_interruptible);
                 
                 if ((thread->timeout_pending) &&
@@ -264 +265 @@
 int waitq_sleep_timeout(waitq_t *wq, uint32_t usec, unsigned int flags)
 {
-        ASSERT((!PREEMPTION_DISABLED) || (PARAM_NON_BLOCKING(flags, usec)));
+        assert((!PREEMPTION_DISABLED) || (PARAM_NON_BLOCKING(flags, usec)));
         
         ipl_t ipl = waitq_sleep_prepare(wq);
@@ -496 +497 @@
 static void waitq_complete_wakeup(waitq_t *wq)
 {
-        ASSERT(interrupts_disabled());
+        assert(interrupts_disabled());
         
         irq_spinlock_lock(&wq->lock, false);
@@ -520 +521 @@
         size_t count = 0;
 
-        ASSERT(interrupts_disabled());
-        ASSERT(irq_spinlock_locked(&wq->lock));
+        assert(interrupts_disabled());
+        assert(irq_spinlock_locked(&wq->lock));
         
 loop: