Changeset 37c9fc8 in mainline for kernel/generic/src/proc/scheduler.c

Timestamp:

2010-04-25T10:15:35Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

aa028db

Parents:

883fedc

Message:

Cherry pick revision 404 from lp:~ersin/helenos/measure2.
This fixes the case when the CPU lock was taken while interrupts were enabled.

File:

• kernel/generic/src/proc/scheduler.c (modified) (2 diffs)

kernel/generic/src/proc/scheduler.c

@@ -187 +187 @@
 
 loop:
-        interrupts_enable();
         
         if (atomic_get(&CPU->nrdy) == 0) {
@@ -196 +195 @@
                  */
 
-                /*
+                 /* Mark CPU as it was idle this clock tick */
+                 spinlock_lock(&CPU->lock);
+                 CPU->idle = true;
+                 spinlock_unlock(&CPU->lock);
+
+                 interrupts_enable();
+                 /*
                  * An interrupt might occur right now and wake up a thread.
                  * In such case, the CPU will continue to go to sleep
                  * even though there is a runnable thread.
                  */
-
-                 spinlock_lock(&CPU->lock);
-                 CPU->idle = true;
-                 spinlock_unlock(&CPU->lock);
                  cpu_sleep();
+                 interrupts_disable();
                  goto loop;
         }
-
-        interrupts_disable();
         
         for (i = 0; i < RQ_COUNT; i++) {