X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=64cfe99d53d7c7e7242aa5b50a0506da9ee3fb59;hb=dcf7f575967bec560d500cc4f52e35c21671525c;hp=93379c2d9df3f1a03a4046ae4753a07115400625;hpb=202542965363285e68bb33654a62fe816c69b176;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index 93379c2..64cfe99 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -35,18 +35,45 @@ void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) {
 
 /**
  * @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
+bool Scheduler::is_enabled(const 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) {
+/**
+ * @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);
+	ASSERT(id < enabled_len);
 	return enabled[id];
 }