schedule: reset scheduler when thread is removed

[model-checker.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index 2498347c44cc6e2cb6cbb870a829465c318504db..c9a1ce1ed8be0f9b7176585bb53aaa53f8be8cdf 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -9,26 +9,35 @@ void Scheduler::add_thread(Thread *t)
        readyList.push_back(t);
 }
 
-Thread *Scheduler::next_thread(void)
+void Scheduler::remove_thread(Thread *t)
 {
-       Thread *t = model->schedule_next_thread();
+       if (current == t)
+               current = NULL;
+       else
+               readyList.remove(t);
+}
 
-       print();
+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)
+Thread * Scheduler::get_current_thread(void)
 {
        return current;
 }
@@ -39,7 +48,7 @@ void Scheduler::print()
                printf("Current thread: %d\n", current->get_id());
        else
                printf("No current thread\n");
-       printf("# Threads in ready list: %ld\n", readyList.size());
+       printf("Num. threads in ready list: %ld\n", readyList.size());
 
        std::list<Thread *>::iterator it;
        for (it = readyList.begin(); it != readyList.end(); it++)