X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=93379c2d9df3f1a03a4046ae4753a07115400625;hb=32de2bfc3e9c027730e174614e46010121d09215;hp=f68cb528a16b846a2f2653ecd3336b6ca496fee8;hpb=9593acf48b245704a75d0e115d6dec1baf51f07c;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index f68cb52..93379c2 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -29,6 +29,8 @@ 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();
 }
 
 /**
@@ -43,7 +45,9 @@ bool Scheduler::is_enabled(Thread *t) const
 }
 
 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 +152,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) {