X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=ff1fdf932ee302fb6cc36c9199cd54c15f3bb50d;hb=f6d2ca10d64791d283db4786e7333770c003eb56;hp=78907f1dab02648a327c86f1c0fbd3a72dd80c05;hpb=2e067c102b91db06977412388b69d06a0c0b7166;p=model-checker.git

diff --git a/model.cc b/model.cc
index 78907f1..ff1fdf9 100644
--- a/model.cc
+++ b/model.cc
@@ -101,7 +101,7 @@ thread_id_t ModelChecker::get_next_id()
 }
 
 /** @return the number of user threads created during this execution */
-unsigned int ModelChecker::get_num_threads()
+unsigned int ModelChecker::get_num_threads() const
 {
 	return priv->next_thread_id;
 }
@@ -2000,17 +2000,14 @@ void ModelChecker::build_reads_from_past(ModelAction *curr)
 
 			/* Don't consider more than one seq_cst write if we are a seq_cst read. */
 			if (!curr->is_seqcst() || (!act->is_seqcst() && (last_seq_cst == NULL || !act->happens_before(last_seq_cst))) || act == last_seq_cst) {
-				DEBUG("Adding action to may_read_from:\n");
-				if (DBG_ENABLED()) {
-					act->print();
-					curr->print();
-				}
-
-				if (curr->get_sleep_flag() && ! curr->is_seqcst()) {
-					if (sleep_can_read_from(curr, act))
-						curr->get_node()->add_read_from(act);
-				} else
+				if (!curr->get_sleep_flag() || curr->is_seqcst() || sleep_can_read_from(curr, act)) {
+					DEBUG("Adding action to may_read_from:\n");
+					if (DBG_ENABLED()) {
+						act->print();
+						curr->print();
+					}
 					curr->get_node()->add_read_from(act);
+				}
 			}
 
 			/* Include at most one act per-thread that "happens before" curr */