X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=67b40ec88a809d5c2bff10e07787481a7d934566;hb=d279e84ed265af079ea035d5dff49183def2c144;hp=4d1cb126579584942c67e32160c8f5e33669472b;hpb=b2e1861247c00af280dafdfd79e855f0011dee2d;p=model-checker.git diff --git a/schedule.cc b/schedule.cc index 4d1cb12..67b40ec 100644 --- a/schedule.cc +++ b/schedule.cc @@ -9,11 +9,12 @@ void Scheduler::add_thread(Thread *t) readyList.push_back(t); } -Thread *Scheduler::next_thread(void) +Thread * Scheduler::next_thread(void) { Thread *t = model->schedule_next_thread(); if (t != NULL) { + current = t; readyList.remove(t); } else if (readyList.empty()) { t = NULL; @@ -28,7 +29,7 @@ Thread *Scheduler::next_thread(void) return t; } -Thread *Scheduler::get_current_thread(void) +Thread * Scheduler::get_current_thread(void) { return current; } @@ -39,7 +40,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::iterator it; for (it = readyList.begin(); it != readyList.end(); it++)