X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=promise.cc;h=90591eb60249693d773c534dfbaedf96c4117521;hb=421c3af5d7265b26a4c946a710f2acd986c5d78a;hp=5197ed3a1e0376d1ea4f6060bcfa042f7cd4f0e9;hpb=872ca5527c4df3f59e09b7050fd9d099e73cd362;p=model-checker.git

diff --git a/promise.cc b/promise.cc
index 5197ed3..90591eb 100644
--- a/promise.cc
+++ b/promise.cc
@@ -4,18 +4,29 @@
 
 bool Promise::increment_threads(thread_id_t tid) { 
 	unsigned int id=id_to_int(tid); 
-	if (id>=synced_thread.size()) {
+	if ( id >= synced_thread.size() ) {
 		synced_thread.resize(id+1, false);
 	}
 	if (synced_thread[id])
 		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]) && ( (int)i != promise_tid ) && model->is_enabled(int_to_id(i))) {
+			return false;
+		}
+	}
+	return true;
+}
 
-	for(unsigned int i=0;i<model->get_num_threads();i++) {
-		if (!synced_thread[id] && (enabled[id] == THREAD_ENABLED))
+bool Promise::check_promise() {
+	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]) && model->is_enabled(int_to_id(i))) {
 			return false;
+		}
 	}
 	return true;
 }