Changeset 63e27ef in mainline for kernel/generic/src/proc

Timestamp:

2017-06-19T21:47:42Z (8 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

Location:

kernel/generic/src/proc

Files:

• scheduler.c (modified) (6 diffs)
• task.c (modified) (3 diffs)
• the.c (modified) (3 diffs)
• thread.c (modified) (16 diffs)

kernel/generic/src/proc/scheduler.c

@@ -39 +39 @@
  */
 
+#include <assert.h>
 #include <proc/scheduler.h>
 #include <proc/thread.h>
@@ -64 +65 @@
 #include <print.h>
 #include <log.h>
-#include <debug.h>
 #include <stacktrace.h>
 
@@ -200 +200 @@
 static thread_t *find_best_thread(void)
 {
-        ASSERT(CPU != NULL);
+        assert(CPU != NULL);
         
 loop:
@@ -225 +225 @@
         }
 
-        ASSERT(!CPU->idle);
+        assert(!CPU->idle);
         
         unsigned int i;
@@ -322 +322 @@
         volatile ipl_t ipl;
         
-        ASSERT(CPU != NULL);
+        assert(CPU != NULL);
         
         ipl = interrupts_disable();
@@ -403 +403 @@
         as_t *old_as = AS;
         
-        ASSERT((!THREAD) || (irq_spinlock_locked(&THREAD->lock)));
-        ASSERT(CPU != NULL);
-        ASSERT(interrupts_disabled());
+        assert((!THREAD) || (irq_spinlock_locked(&THREAD->lock)));
+        assert(CPU != NULL);
+        assert(interrupts_disabled());
         
         /*

kernel/generic/src/proc/task.c

@@ -36 +36 @@
  */
 
+#include <assert.h>
 #include <proc/thread.h>
 #include <proc/task.h>
@@ -419 +420 @@
 task_t *task_find_by_id(task_id_t id)
 {
-        ASSERT(interrupts_disabled());
-        ASSERT(irq_spinlock_locked(&tasks_lock));
+        assert(interrupts_disabled());
+        assert(irq_spinlock_locked(&tasks_lock));
 
         avltree_node_t *node =
@@ -443 +444 @@
 void task_get_accounting(task_t *task, uint64_t *ucycles, uint64_t *kcycles)
 {
-        ASSERT(interrupts_disabled());
-        ASSERT(irq_spinlock_locked(&task->lock));
+        assert(interrupts_disabled());
+        assert(irq_spinlock_locked(&task->lock));
 
         /* Accumulated values of task */

kernel/generic/src/proc/the.c

@@ -43 +43 @@
 
 #include <arch.h>
-#include <debug.h>
+#include <assert.h>
 
 /** Initialize THE structure
@@ -60 +60 @@
         the->as = NULL;
         the->magic = MAGIC;
-#ifdef RCU_PREEMPT_A    
+#ifdef RCU_PREEMPT_A
         the->rcu_nesting = 0;
 #endif
@@ -75 +75 @@
 NO_TRACE void the_copy(the_t *src, the_t *dst)
 {
-        ASSERT(src->magic == MAGIC);
+        assert(src->magic == MAGIC);
         *dst = *src;
 }

kernel/generic/src/proc/thread.c

@@ -36 +36 @@
  */
 
+#include <assert.h>
 #include <proc/scheduler.h>
 #include <proc/thread.h>
@@ -64 +65 @@
 #include <print.h>
 #include <mm/slab.h>
-#include <debug.h>
 #include <main/uinit.h>
 #include <syscall/copy.h>
@@ -268 +268 @@
 static void before_thread_is_ready(thread_t *thread)
 {
-        ASSERT(irq_spinlock_locked(&thread->lock));
+        assert(irq_spinlock_locked(&thread->lock));
         workq_before_thread_is_ready(thread);
 }
@@ -283 +283 @@
         irq_spinlock_lock(&thread->lock, true);
         
-        ASSERT(thread->state != Ready);
+        assert(thread->state != Ready);
 
         before_thread_is_ready(thread);
@@ -293 +293 @@
         if (thread->wired || thread->nomigrate || thread->fpu_context_engaged) {
                 /* Cannot ready to another CPU */
-                ASSERT(thread->cpu != NULL);
+                assert(thread->cpu != NULL);
                 cpu = thread->cpu;
         } else if (thread->stolen) {
@@ -300 +300 @@
         } else if (thread->cpu) {
                 /* Prefer the CPU on which the thread ran last */
-                ASSERT(thread->cpu != NULL);
+                assert(thread->cpu != NULL);
                 cpu = thread->cpu;
         } else {
@@ -431 +431 @@
 void thread_destroy(thread_t *thread, bool irq_res)
 {
-        ASSERT(irq_spinlock_locked(&thread->lock));
-        ASSERT((thread->state == Exiting) || (thread->state == Lingering));
-        ASSERT(thread->task);
-        ASSERT(thread->cpu);
+        assert(irq_spinlock_locked(&thread->lock));
+        assert((thread->state == Exiting) || (thread->state == Lingering));
+        assert(thread->task);
+        assert(thread->cpu);
         
         irq_spinlock_lock(&thread->cpu->lock, false);
@@ -561 +561 @@
 void thread_interrupt(thread_t *thread)
 {
-        ASSERT(thread != NULL);
+        assert(thread != NULL);
         
         irq_spinlock_lock(&thread->lock, true);
@@ -582 +582 @@
 bool thread_interrupted(thread_t *thread)
 {
-        ASSERT(thread != NULL);
+        assert(thread != NULL);
         
         bool interrupted;
@@ -596 +596 @@
 void thread_migration_disable(void)
 {
-        ASSERT(THREAD);
+        assert(THREAD);
         
         THREAD->nomigrate++;
@@ -604 +604 @@
 void thread_migration_enable(void)
 {
-        ASSERT(THREAD);
-        ASSERT(THREAD->nomigrate > 0);
+        assert(THREAD);
+        assert(THREAD->nomigrate > 0);
         
         if (THREAD->nomigrate > 0)
@@ -650 +650 @@
         
         irq_spinlock_lock(&thread->lock, true);
-        ASSERT(!thread->detached);
+        assert(!thread->detached);
         irq_spinlock_unlock(&thread->lock, true);
         
@@ -671 +671 @@
          */
         irq_spinlock_lock(&thread->lock, true);
-        ASSERT(!thread->detached);
+        assert(!thread->detached);
         
         if (thread->state == Lingering) {
@@ -809 +809 @@
 bool thread_exists(thread_t *thread)
 {
-        ASSERT(interrupts_disabled());
-        ASSERT(irq_spinlock_locked(&threads_lock));
+        assert(interrupts_disabled());
+        assert(irq_spinlock_locked(&threads_lock));
 
         avltree_node_t *node =
@@ -830 +830 @@
         uint64_t time = get_cycle();
 
-        ASSERT(interrupts_disabled());
-        ASSERT(irq_spinlock_locked(&THREAD->lock));
+        assert(interrupts_disabled());
+        assert(irq_spinlock_locked(&THREAD->lock));
         
         if (user)
@@ -867 +867 @@
 thread_t *thread_find_by_id(thread_id_t thread_id)
 {
-        ASSERT(interrupts_disabled());
-        ASSERT(irq_spinlock_locked(&threads_lock));
+        assert(interrupts_disabled());
+        assert(irq_spinlock_locked(&threads_lock));
         
         thread_iterator_t iterator;