X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=d96172e010d445a2b06eff5b392b89161126f12e;hb=5fe0eea8bf392753f69ed8193a592b299a137e9c;hp=d344fb1acdcf858db73d098b7341a8dae930125f;hpb=6357baf85edec072a52c7ea18e9fdb087765f9cb;p=model-checker.git diff --git a/schedule.cc b/schedule.cc index d344fb1..d96172e 100644 --- a/schedule.cc +++ b/schedule.cc @@ -3,16 +3,44 @@ #include "common.h" #include "model.h" +/** Constructor */ +Scheduler::Scheduler() : + current(NULL) +{ +} + +/** + * Add a Thread to the scheduler's ready list. + * @param t The Thread to add + */ void Scheduler::add_thread(Thread *t) { DEBUG("thread %d\n", t->get_id()); readyList.push_back(t); } -Thread *Scheduler::next_thread(void) +/** + * Remove a given Thread from the scheduler. + * @param t The Thread to remove + */ +void Scheduler::remove_thread(Thread *t) { - Thread *t = model->schedule_next_thread(); + if (current == t) + current = NULL; + else + readyList.remove(t); +} +/** + * Remove one Thread from the scheduler. This implementation defaults to FIFO, + * if a thread is not already provided. + * + * @param t Thread to run, if chosen by an external entity (e.g., + * ModelChecker). May be NULL to indicate no external choice. + * @return The next Thread to run + */ +Thread * Scheduler::next_thread(Thread *t) +{ if (t != NULL) { current = t; readyList.remove(t); @@ -29,20 +57,27 @@ Thread *Scheduler::next_thread(void) return t; } -Thread *Scheduler::get_current_thread(void) +/** + * @return The currently-running Thread + */ +Thread * Scheduler::get_current_thread() const { return current; } -void Scheduler::print() +/** + * Print debugging information about the current state of the scheduler. Only + * prints something if debugging is enabled. + */ +void Scheduler::print() const { if (current) - printf("Current thread: %d\n", current->get_id()); + DEBUG("Current thread: %d\n", current->get_id()); else - printf("No current thread\n"); - printf("# Threads in ready list: %ld\n", readyList.size()); + DEBUG("No current thread\n"); + DEBUG("Num. threads in ready list: %zu\n", readyList.size()); - std::list::iterator it; + std::list >::const_iterator it; for (it = readyList.begin(); it != readyList.end(); it++) - printf("In ready list: thread %d\n", (*it)->get_id()); + DEBUG("In ready list: thread %d\n", (*it)->get_id()); }