Ticket #10468: 10468-assertions.diff

src/system/kernel/scheduler/scheduler.cpp

@@ -337 +337 @@
     oldThread->state = nextState;
 
     // return time spent in interrupts
-    oldThreadData->SetStolenInterruptTime(gCPU[thisCPU].interrupt_time);
+    if (!oldThreadData->IsIdle())
+        oldThreadData->SetStolenInterruptTime(gCPU[thisCPU].interrupt_time);
 
     bool enqueueOldThread = false;
     bool putOldThreadAtBack = false;

src/system/kernel/scheduler/scheduler_thread.h

@@ -274 +274 @@
     SCHEDULER_ENTER_FUNCTION();
 
     interruptTime -= fLastInterruptTime;
+    ASSERT(interruptTime >= 0);
+    ASSERT(fStolenTime >= 0);
     fStolenTime += interruptTime;
 }
 
@@ -283 +285 @@
 {
     SCHEDULER_ENTER_FUNCTION();
 
+    ASSERT(!IsIdle());
+    ASSERT(fStolenTime >= 0);
+    ASSERT(gCurrentMode->minimal_quantum >= 0);
     bigtime_t stolenTime = std::min(fStolenTime, gCurrentMode->minimal_quantum);
     ASSERT(stolenTime >= 0);
     fStolenTime -= stolenTime;
@@ -318 +323 @@
     // too little time left, it's better make the next quantum a bit longer
     bigtime_t skipTime = gCurrentMode->minimal_quantum / 2;
     if (hasYielded || wasPreempted || timeLeft <= skipTime) {
+        ASSERT(fStolenTime >= 0);
+        ASSERT(timeLeft >= 0);
         fStolenTime += timeLeft;
         timeLeft = 0;
     }