improve scheduler debugging

[model-checker.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index 13b640cd8e832b2cca826e5a4b68d66143bb854c..0f550c41962a5046c6934fe5380d17e0cda39e36 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -14,19 +14,35 @@ Thread *Scheduler::next_thread(void)
        Thread *t = model->schedule_next_thread();
 
        if (t != NULL) {
+               current = t;
                readyList.remove(t);
-               return t;
+       } else if (readyList.empty()) {
+               t = NULL;
+       } else {
+               t = readyList.front();
+               current = t;
+               readyList.pop_front();
        }
-       if (readyList.empty())
-               return NULL;
 
-       current = readyList.front();
-       readyList.pop_front();
+       print();
 
-       return current;
+       return t;
 }
 
 Thread *Scheduler::get_current_thread(void)
 {
        return current;
 }
+
+void Scheduler::print()
+{
+       if (current)
+               printf("Current thread: %d\n", current->get_id());
+       else
+               printf("No current thread\n");
+       printf("Num. threads in ready list: %ld\n", readyList.size());
+
+       std::list<Thread *>::iterator it;
+       for (it = readyList.begin(); it != readyList.end(); it++)
+               printf("In ready list: thread %d\n", (*it)->get_id());
+}