Changeset 623ba26c in mainline for src/proc/scheduler.c

Timestamp:

2005-09-01T14:42:09Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e83a9f7

Parents:

db3341e

Message:

Add couple of assertions CPU != NULL.

Change type of nrdy from int to count_t.

Rewrite halt() to avoid page fault when CPU == NULL.

File:

• src/proc/scheduler.c (modified) (5 diffs)

src/proc/scheduler.c

@@ -47 +47 @@
 #include <mm/frame.h>
 #include <mm/heap.h>
-
-
-volatile int nrdy;
+#include <debug.h>
+
+volatile count_t nrdy;
 
 
@@ -90 +90 @@
         runq_t *r;
         int i, n;
+
+        ASSERT(CPU != NULL);
 
 loop:
@@ -148 +150 @@
                 spinlock_unlock(&CPU->lock);
 
-                atomic_dec(&nrdy);
+                atomic_dec((int *) &nrdy);
                 r->n--;
 
@@ -230 +232 @@
         volatile pri_t pri;
 
+        ASSERT(CPU != NULL);
+
         pri = cpu_priority_high();
 
@@ -292 +296 @@
 {
         int priority;
+
+        ASSERT(CPU != NULL);
 
         if (THREAD) {