X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=444e1a82982535339f241d5eb203fddf1d00a15a;hb=d70f6f259c9850e5fceb527e3a9541c440c0146b;hp=cbb4957a3e4a3865730679e8e816dfb51f636324;hpb=2cd14a2ba5f68a5bd35c1094c9d5a83891b483f8;p=model-checker.git diff --git a/schedule.cc b/schedule.cc index cbb4957..444e1a8 100644 --- a/schedule.cc +++ b/schedule.cc @@ -1,22 +1,120 @@ -#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(const 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); +} + +/** + * @brief Check if a Thread is currently in the sleep set + * @param t The Thread to check + * @return True if the Thread is currently enabled + */ +bool Scheduler::is_sleep_set(const Thread *t) const +{ + return get_enabled(t) == THREAD_SLEEP_SET; +} + +enabled_type_t Scheduler::get_enabled(const Thread *t) const +{ + int id = id_to_int(t->get_id()); + ASSERT(id < enabled_len); + return enabled[id]; +} + +void Scheduler::update_sleep_set(Node *n) { + enabled_type_t *enabled_array = n->get_enabled_array(); + for (int i = 0; i < enabled_len; i++) { + if (enabled_array[i] == THREAD_SLEEP_SET) { + enabled[i] = THREAD_SLEEP_SET; + } + } +} + +/** + * Add a Thread to the sleep set. + * @param t The Thread to add + */ +void Scheduler::add_sleep(Thread *t) +{ + DEBUG("thread %d\n", id_to_int(t->get_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,8 +125,7 @@ void Scheduler::remove_thread(Thread *t) { if (current == t) current = NULL; - else - readyList.remove(t); + set_enabled(t, THREAD_DISABLED); } /** @@ -38,7 +135,7 @@ void Scheduler::remove_thread(Thread *t) */ void Scheduler::sleep(Thread *t) { - remove_thread(t); + set_enabled(t, THREAD_DISABLED); t->set_state(THREAD_BLOCKED); } @@ -48,13 +145,14 @@ void Scheduler::sleep(Thread *t) */ 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. @@ -62,19 +160,43 @@ 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; i < enabled_len; i++) { + thread_id_t tid = int_to_id(i); + if (n->has_priority(tid)) { + DEBUG("Node (tid %d) has priority\n", i); + //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; } @@ -83,6 +205,7 @@ Thread * Scheduler::next_thread(Thread *t) */ Thread * Scheduler::get_current_thread() const { + ASSERT(!current || !current->is_model_thread()); return current; } @@ -93,12 +216,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()); }