X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=26217d0a99dfd918d37d90fd77b3a803aefadc26;hb=44118f596eb7cd9b4b0b5037fbbf958db001accc;hp=1cd5b0f1a9f3db7410965a8afad7e67f27a360d3;hpb=d884d14a6288f1ee1809158e81ffb05bf83f483b;p=model-checker.git diff --git a/schedule.cc b/schedule.cc index 1cd5b0f..26217d0 100644 --- a/schedule.cc +++ b/schedule.cc @@ -29,17 +29,35 @@ 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(); } /** * @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 { - int id = id_to_int(t->get_id()); - return (id >= enabled_len) ? false : (enabled[id] != THREAD_DISABLED); + 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) {