X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=schedule.cc;h=26217d0a99dfd918d37d90fd77b3a803aefadc26;hp=be4a92f739a1129bb2aa4bee50bb23ba0a3f8556;hb=4159ba45e83f6542e3a3320e83bca9fbaf2da3ea;hpb=c5b57f3d98d1d14b4546995a0882753cf71a1c4b diff --git a/schedule.cc b/schedule.cc index be4a92f7..26217d0a 100644 --- a/schedule.cc +++ b/schedule.cc @@ -1,22 +1,109 @@ -#include "threads.h" +#include +#include + +#include "threads-model.h" #include "schedule.h" #include "common.h" #include "model.h" +#include "nodestack.h" /** Constructor */ Scheduler::Scheduler() : + enabled(NULL), + enabled_len(0), + curr_thread_index(0), current(NULL) { } +void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) { + int threadid=id_to_int(t->get_id()); + if (threadid>=enabled_len) { + enabled_type_t *new_enabled = (enabled_type_t *)snapshot_malloc(sizeof(enabled_type_t) * (threadid + 1)); + memset(&new_enabled[enabled_len], 0, (threadid+1-enabled_len)*sizeof(enabled_type_t)); + if (enabled != NULL) { + memcpy(new_enabled, enabled, enabled_len*sizeof(enabled_type_t)); + snapshot_free(enabled); + } + enabled=new_enabled; + enabled_len=threadid+1; + } + enabled[threadid]=enabled_status; + if (enabled_status == THREAD_DISABLED) + model->check_promises_thread_disabled(); +} + +/** + * @brief Check if a Thread is currently enabled + * + * Check if a Thread is currently enabled. "Enabled" includes both + * THREAD_ENABLED and THREAD_SLEEP_SET. + * @param t The Thread to check + * @return True if the Thread is currently enabled + */ +bool Scheduler::is_enabled(Thread *t) const +{ + return is_enabled(t->get_id()); +} + +/** + * @brief Check if a Thread is currently enabled + * + * Check if a Thread is currently enabled. "Enabled" includes both + * THREAD_ENABLED and THREAD_SLEEP_SET. + * @param tid The ID of the Thread to check + * @return True if the Thread is currently enabled + */ +bool Scheduler::is_enabled(thread_id_t tid) const +{ + int i = id_to_int(tid); + return (i >= enabled_len) ? false : (enabled[i] != THREAD_DISABLED); +} + +enabled_type_t Scheduler::get_enabled(Thread *t) { + int id = id_to_int(t->get_id()); + ASSERT(idget_enabled_array(); + for(int i=0;iget_id())); + set_enabled(t, THREAD_SLEEP_SET); +} + +/** + * Remove a Thread from the sleep set. + * @param t The Thread to remove + */ +void Scheduler::remove_sleep(Thread *t) +{ + DEBUG("thread %d\n", id_to_int(t->get_id())); + set_enabled(t, THREAD_ENABLED); +} + /** * 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); + DEBUG("thread %d\n", id_to_int(t->get_id())); + ASSERT(!t->is_model_thread()); + set_enabled(t, THREAD_ENABLED); } /** @@ -27,22 +114,18 @@ void Scheduler::remove_thread(Thread *t) { if (current == t) current = NULL; - else - readyList.remove(t); + set_enabled(t, THREAD_DISABLED); } /** - * Force one Thread to wait on another Thread. The "join" Thread should - * eventually wake up the waiting Thread via Scheduler::wake. - * @param wait The Thread that should wait - * @param join The Thread on which we are waiting. + * Prevent a Thread from being scheduled. The sleeping Thread should be + * re-awoken via Scheduler::wake. + * @param thread The Thread that should sleep */ -void Scheduler::wait(Thread *wait, Thread *join) +void Scheduler::sleep(Thread *t) { - ASSERT(!join->is_complete()); - remove_thread(wait); - join->push_wait_list(wait); - wait->set_state(THREAD_BLOCKED); + set_enabled(t, THREAD_DISABLED); + t->set_state(THREAD_BLOCKED); } /** @@ -51,13 +134,14 @@ void Scheduler::wait(Thread *wait, Thread *join) */ void Scheduler::wake(Thread *t) { - add_thread(t); + ASSERT(!t->is_model_thread()); + set_enabled(t, THREAD_ENABLED); t->set_state(THREAD_READY); } /** - * Remove one Thread from the scheduler. This implementation defaults to FIFO, - * if a thread is not already provided. + * Select a Thread. This implementation defaults to round-robin, 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. @@ -65,19 +149,42 @@ void Scheduler::wake(Thread *t) */ Thread * Scheduler::next_thread(Thread *t) { - if (t != NULL) { - current = t; - readyList.remove(t); - } else if (readyList.empty()) { + if ( t == NULL ) { + int old_curr_thread = curr_thread_index; + bool have_enabled_thread_with_priority=false; + Node *n=model->get_curr_node(); + + for(int i=0;ihas_priority(tid)) { + //Have a thread with priority + if (enabled[i]!=THREAD_DISABLED) + have_enabled_thread_with_priority=true; + } + } + + while(true) { + curr_thread_index = (curr_thread_index+1) % enabled_len; + thread_id_t curr_tid=int_to_id(curr_thread_index); + if (enabled[curr_thread_index]==THREAD_ENABLED&& + (!have_enabled_thread_with_priority||n->has_priority(curr_tid))) { + t = model->get_thread(curr_tid); + break; + } + if (curr_thread_index == old_curr_thread) { + print(); + return NULL; + } + } + } else if (t->is_model_thread()) { + /* model-checker threads never run */ t = NULL; } else { - t = readyList.front(); - current = t; - readyList.pop_front(); + curr_thread_index = id_to_int(t->get_id()); } + current = t; print(); - return t; } @@ -86,6 +193,7 @@ Thread * Scheduler::next_thread(Thread *t) */ Thread * Scheduler::get_current_thread() const { + ASSERT(!current || !current->is_model_thread()); return current; } @@ -96,12 +204,7 @@ Thread * Scheduler::get_current_thread() const void Scheduler::print() const { if (current) - DEBUG("Current thread: %d\n", current->get_id()); + DEBUG("Current thread: %d\n", id_to_int(current->get_id())); else DEBUG("No current thread\n"); - DEBUG("Num. threads in ready list: %zu\n", readyList.size()); - - std::list >::const_iterator it; - for (it = readyList.begin(); it != readyList.end(); it++) - DEBUG("In ready list: thread %d\n", (*it)->get_id()); }