Changes in kernel/generic/src/proc/thread.c [e7c4115d:8ad7dd1] in mainline

File:

• kernel/generic/src/proc/thread.c (modified) (17 diffs)

kernel/generic/src/proc/thread.c

@@ -36 +36 @@
  */
 
-#include <assert.h>
 #include <proc/scheduler.h>
 #include <proc/thread.h>
@@ -62 +61 @@
 #include <arch/faddr.h>
 #include <atomic.h>
-#include <mem.h>
+#include <memstr.h>
 #include <print.h>
 #include <mm/slab.h>
+#include <debug.h>
 #include <main/uinit.h>
 #include <syscall/copy.h>
@@ -228 +228 @@
 #endif
         
-        return STACK_FRAMES;  /* number of frames freed */
+        return 1;  /* One page freed */
 }
 
@@ -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;