X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=schedule.cc;h=26217d0a99dfd918d37d90fd77b3a803aefadc26;hp=f68cb528a16b846a2f2653ecd3336b6ca496fee8;hb=7966c737f2a88e5e1a56817eb9f6fdaead3eca92;hpb=1b793f0683aff025afe2e19519572e3599575a19

diff --git a/schedule.cc b/schedule.cc
index f68cb528..26217d0a 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -29,21 +29,41 @@ 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) {
-	return enabled[id_to_int(t->get_id())];
+	int id = id_to_int(t->get_id());
+	ASSERT(id<enabled_len);
+	return enabled[id];
 }
 
 void Scheduler::update_sleep_set(Node *n) {
@@ -148,7 +168,7 @@ Thread * Scheduler::next_thread(Thread *t)
 			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(int_to_id(curr_tid));
+				t = model->get_thread(curr_tid);
 				break;
 			}
 			if (curr_thread_index == old_curr_thread) {