X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=promise.cc;h=90591eb60249693d773c534dfbaedf96c4117521;hp=59fb9ee43115cd81ed60b2487ffbb563e90bd6da;hb=6e5c0bb2359b9fba6160957ffa88974233ba18ac;hpb=202542965363285e68bb33654a62fe816c69b176

diff --git a/promise.cc b/promise.cc
index 59fb9ee4..90591eb6 100644
--- a/promise.cc
+++ b/promise.cc
@@ -11,11 +11,10 @@ bool Promise::increment_threads(thread_id_t tid) {
 		return false;
 	
 	synced_thread[id]=true;
-	enabled_type_t * enabled=model->get_scheduler()->get_enabled();
 	unsigned int sync_size=synced_thread.size();
 	int promise_tid=id_to_int(read->get_tid());
 	for(unsigned int i=1;i<model->get_num_threads();i++) {
-		if ((i >= sync_size || !synced_thread[i]) && ( i != promise_tid ) && (enabled[i] != THREAD_DISABLED)) {
+		if ((i >= sync_size || !synced_thread[i]) && ( (int)i != promise_tid ) && model->is_enabled(int_to_id(i))) {
 			return false;
 		}
 	}
@@ -23,10 +22,9 @@ bool Promise::increment_threads(thread_id_t tid) {
 }
 
 bool Promise::check_promise() {
-	enabled_type_t * enabled=model->get_scheduler()->get_enabled();
 	unsigned int sync_size=synced_thread.size();
 	for(unsigned int i=1;i<model->get_num_threads();i++) {
-		if ((i >= sync_size || !synced_thread[i]) && (enabled[i] != THREAD_DISABLED)) {
+		if ((i >= sync_size || !synced_thread[i]) && model->is_enabled(int_to_id(i))) {
 			return false;
 		}
 	}