improve scheduler debugging

[c11tester.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index 04328252da0c8dbbf1452e4b7cd6d091c14a7116..0f550c41962a5046c6934fe5380d17e0cda39e36 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -11,16 +11,38 @@ void Scheduler::add_thread(Thread *t)
 
 Thread *Scheduler::next_thread(void)
 {
-       if (readyList.empty())
-               return NULL;
+       Thread *t = model->schedule_next_thread();
 
-       current = readyList.front();
-       readyList.pop_front();
+       if (t != NULL) {
+               current = t;
+               readyList.remove(t);
+       } else if (readyList.empty()) {
+               t = NULL;
+       } else {
+               t = readyList.front();
+               current = t;
+               readyList.pop_front();
+       }
 
-       return current;
+       print();
+
+       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());
+}