X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=e394865e26c01d75b05853a55a4b2b7a23c3e853;hb=20a4630cb01dc613d138d29a4b03a424bf1fd74d;hp=e11dcf716939e1a13f1dd08f6b252ab60fef1b9b;hpb=5d87d23f622d396fd2e1c94d61f901429c5f35ac;p=model-checker.git

diff --git a/model.cc b/model.cc
index e11dcf7..e394865 100644
--- a/model.cc
+++ b/model.cc
@@ -12,7 +12,7 @@
 #include "promise.h"
 #include "datarace.h"
 #include "mutex.h"
-#include "threads.h"
+#include "threads-model.h"
 
 #define INITIAL_THREAD_ID	0
 
@@ -260,7 +260,8 @@ bool ModelChecker::next_execution()
 	DEBUG("Number of acquires waiting on pending release sequences: %zu\n",
 			pending_rel_seqs->size());
 
-	if (isfinalfeasible() || DBG_ENABLED())
+
+	if (isfinalfeasible() || (params.bound != 0 && priv->used_sequence_numbers > params.bound ) || DBG_ENABLED() )
 		print_summary();
 
 	if ((diverge = get_next_backtrack()) == NULL)
@@ -766,10 +767,9 @@ Thread * ModelChecker::check_current_action(ModelAction *curr)
 		return get_next_thread(NULL);
 	}
 
-	wake_up_sleeping_actions(curr);
-
 	ModelAction *newcurr = initialize_curr_action(curr);
 
+	wake_up_sleeping_actions(curr);
 
 	/* Add the action to lists before any other model-checking tasks */
 	if (!second_part_of_rmw)
@@ -1779,6 +1779,11 @@ void ModelChecker::mo_check_promises(thread_id_t tid, const ModelAction *write)
 			//do we have a pwrite for the promise, if not, set it
 			if (promise->get_write() == NULL ) {
 				promise->set_write(write);
+				//The pwrite cannot happen before the promise
+				if (write->happens_before(act) && (write != act)) {
+					failed_promise = true;
+					return;
+				}
 			}
 			if (mo_graph->checkPromise(write, promise)) {
 				failed_promise = true;
@@ -1868,7 +1873,7 @@ void ModelChecker::build_reads_from_past(ModelAction *curr)
 					curr->print();
 				}
 
-				if (curr->get_sleep_flag()) {
+				if (curr->get_sleep_flag() && ! curr->is_seqcst()) {
 					if (sleep_can_read_from(curr, act))
 						curr->get_node()->add_read_from(act);
 				} else
@@ -2068,6 +2073,12 @@ bool ModelChecker::take_step() {
 	if (!isfeasible())
 		return false;
 
+	if (params.bound != 0) {
+		if (priv->used_sequence_numbers > params.bound) {
+			return false;
+		}
+	}
+
 	DEBUG("(%d, %d)\n", curr ? id_to_int(curr->get_id()) : -1,
 			next ? id_to_int(next->get_id()) : -1);