X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=schedule.cc;h=f68786a825698f64052729f5032b332a3925e824;hp=602cdb75352430b2efbd58526bf8de779c0b1c6f;hb=a72579537233ec7d21ac24d895b9cbe7cfe16f2d;hpb=1ec752235b9629b1608babda6a9582fc9a0dd1a7 diff --git a/schedule.cc b/schedule.cc index 602cdb75..f68786a8 100644 --- a/schedule.cc +++ b/schedule.cc @@ -5,10 +5,38 @@ #include "schedule.h" #include "common.h" #include "model.h" -#include "nodestack.h" +#include "execution.h" +#include "fuzzer.h" + +/** + * Format an "enabled_type_t" for printing + * @param e The type to format + * @param str The output character array + */ +void enabled_type_to_string(enabled_type_t e, char *str) +{ + const char *res; + switch (e) { + case THREAD_DISABLED: + res = "disabled"; + break; + case THREAD_ENABLED: + res = "enabled"; + break; + case THREAD_SLEEP_SET: + res = "sleep"; + break; + default: + ASSERT(0); + res = NULL; + break; + } + strcpy(str, res); +} /** Constructor */ Scheduler::Scheduler() : + execution(NULL), enabled(NULL), enabled_len(0), curr_thread_index(0), @@ -16,6 +44,15 @@ Scheduler::Scheduler() : { } +/** + * @brief Register the ModelExecution engine + * @param execution The ModelExecution which is controlling execution + */ +void Scheduler::register_engine(ModelExecution *execution) +{ + this->execution = execution; +} + void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) { int threadid = id_to_int(t->get_id()); if (threadid >= enabled_len) { @@ -29,8 +66,6 @@ void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) { enabled_len = threadid + 1; } enabled[threadid] = enabled_status; - if (enabled_status == THREAD_DISABLED) - model->check_promises_thread_disabled(); } /** @@ -70,6 +105,23 @@ bool Scheduler::is_sleep_set(const Thread *t) const return get_enabled(t) == THREAD_SLEEP_SET; } +/** + * @brief Check if execution is stuck with no enabled threads and some sleeping + * thread + * @return True if no threads are enabled and some thread is in the sleep set; + * false otherwise + */ +bool Scheduler::all_threads_sleeping() const +{ + bool sleeping = false; + for (int i = 0;i < enabled_len;i++) + if (enabled[i] == THREAD_ENABLED) + return false; + else if (enabled[i] == THREAD_SLEEP_SET) + sleeping = true; + return sleeping; +} + enabled_type_t Scheduler::get_enabled(const Thread *t) const { int id = id_to_int(t->get_id()); @@ -77,15 +129,6 @@ enabled_type_t Scheduler::get_enabled(const Thread *t) const 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 @@ -151,55 +194,58 @@ void Scheduler::wake(Thread *t) } /** - * Select a Thread. This implementation defaults to round-robin, if a - * thread is not already provided. + * @brief Select a Thread to run via round-robin + * * - * @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) { - 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; - } - } +Thread * Scheduler::select_next_thread() +{ + int avail_threads = 0; + int sleep_threads = 0; + int thread_list[enabled_len], sleep_list[enabled_len]; + Thread * thread; - 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) { - if (DBG_ENABLED()) - print(); - return NULL; - } + for (int i = 0; i < enabled_len; i++) { + if (enabled[i] == THREAD_ENABLED) + thread_list[avail_threads++] = i; + else if (enabled[i] == THREAD_SLEEP_SET) + sleep_list[sleep_threads++] = i; + } + + if (avail_threads == 0 && !execution->getFuzzer()->has_paused_threads()) { + if (sleep_threads != 0) { + // No threads available, but some threads sleeping. Wake up one of them + thread = execution->getFuzzer()->selectThread(sleep_list, sleep_threads); + remove_sleep(thread); + thread->set_wakeup_state(true); + } else { + return NULL; // No threads available and no threads sleeping. } - } else if (t->is_model_thread()) { - /* model-checker threads never run */ - t = NULL; } else { - curr_thread_index = id_to_int(t->get_id()); + // Some threads are available + thread = execution->getFuzzer()->selectThread(thread_list, avail_threads); } + curr_thread_index = id_to_int(thread->get_id()); + return thread; +} + +void Scheduler::set_scheduler_thread(thread_id_t tid) { + curr_thread_index=id_to_int(tid); +} + +/** + * @brief Set the current "running" Thread + * @param t Thread to run + */ +void Scheduler::set_current_thread(Thread *t) +{ + ASSERT(!t || !t->is_model_thread()); + current = t; if (DBG_ENABLED()) print(); - return t; } /** @@ -217,8 +263,13 @@ Thread * Scheduler::get_current_thread() const */ void Scheduler::print() const { - if (current) - model_print("Current thread: %d\n", id_to_int(current->get_id())); - else - model_print("No current thread\n"); + int curr_id = current ? id_to_int(current->get_id()) : -1; + + model_print("Scheduler: "); + for (int i = 0;i < enabled_len;i++) { + char str[20]; + enabled_type_to_string(enabled[i], str); + model_print("[%i: %s%s]", i, i == curr_id ? "current, " : "", str); + } + model_print("\n"); }