schedule: bugfix - set 'current' thread in all cases

[model-checker.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index c02ca62b12a16cd1c07d58ffd20f1ac383b57181..d344fb1acdcf858db73d098b7341a8dae930125f 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,28 +1,48 @@
-#include <stdlib.h>
-
-#include "libthreads.h"
+#include "threads.h"
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
 
-void DefaultScheduler::add_thread(struct thread *t)
+void Scheduler::add_thread(Thread *t)
 {
-       DEBUG("thread %d\n", t->id);
-       queue.push_back(t);
+       DEBUG("thread %d\n", t->get_id());
+       readyList.push_back(t);
 }
 
-struct thread *DefaultScheduler::next_thread(void)
+Thread *Scheduler::next_thread(void)
 {
-       if (queue.empty())
-               return NULL;
+       Thread *t = model->schedule_next_thread();
 
-       current = queue.front();
-       queue.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;
 }
 
-struct thread *DefaultScheduler::get_current_thread(void)
+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("# 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());
+}