X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.cc;h=9c0df20b5de89bd2876cde69ca281502506f4709;hb=3f77119600ac3aa246258dec2776056d09f8e4e0;hp=404339b6ebcf033b96b55f6b66aa4832c4dc1259;hpb=3f24c24a6fd349da74351946477b85d807709410;p=model-checker.git

diff --git a/nodestack.cc b/nodestack.cc
index 404339b..9c0df20 100644
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -164,7 +164,7 @@ bool Node::increment_promise()
 				//sending our value to two rmws... not going to work..try next combination
 				continue;
 			}
-			promises[i] = (promises[i] & PROMISE_RMW) |PROMISE_FULFILLED;
+			promises[i] = (promises[i] & PROMISE_RMW) | PROMISE_FULFILLED;
 			while (i > 0) {
 				i--;
 				if ((promises[i] & PROMISE_MASK) == PROMISE_FULFILLED)
@@ -188,9 +188,9 @@ bool Node::promise_empty() const
 	for (int i = promises.size() - 1; i >= 0; i--) {
 		if (promises[i] == PROMISE_UNFULFILLED)
 			return false;
-		if (!fulfilledrmw && ((promises[i]&PROMISE_MASK) == PROMISE_UNFULFILLED))
+		if (!fulfilledrmw && ((promises[i] & PROMISE_MASK) == PROMISE_UNFULFILLED))
 			return false;
-		if (promises[i] == (PROMISE_FULFILLED|PROMISE_RMW))
+		if (promises[i] == (PROMISE_FULFILLED | PROMISE_RMW))
 			fulfilledrmw = true;
 	}
 	return true;
@@ -226,12 +226,14 @@ bool Node::misc_empty() const
  * @param value is the value to backtrack to.
  * @return True if the future value was successully added; false otherwise
  */
-bool Node::add_future_value(const ModelAction *writer, modelclock_t expiration)
+bool Node::add_future_value(struct future_value fv)
 {
-	uint64_t value = writer->get_value();
+	uint64_t value = fv.value;
+	modelclock_t expiration = fv.expiration;
+	thread_id_t tid = fv.tid;
 	int idx = -1; /* Highest index where value is found */
 	for (unsigned int i = 0; i < future_values.size(); i++) {
-		if (future_values[i].value == value) {
+		if (future_values[i].value == value && future_values[i].tid == tid) {
 			if (expiration <= future_values[i].expiration)
 				return false;
 			idx = i;
@@ -251,8 +253,7 @@ bool Node::add_future_value(const ModelAction *writer, modelclock_t expiration)
 			(int)future_values.size() >= model->params.maxfuturevalues)
 		return false;
 
-	struct future_value newfv = {value, expiration};
-	future_values.push_back(newfv);
+	future_values.push_back(fv);
 	return true;
 }
 
@@ -347,6 +348,14 @@ thread_id_t Node::get_next_backtrack()
 	return int_to_id(i);
 }
 
+void Node::clear_backtracking()
+{
+	for (unsigned int i = 0; i < backtrack.size(); i++)
+		backtrack[i] = false;
+	for (unsigned int i = 0; i < explored_children.size(); i++)
+		explored_children[i] = false;
+}
+
 bool Node::is_enabled(Thread *t) const
 {
 	int thread_id = id_to_int(t->get_id());
@@ -555,7 +564,11 @@ ModelAction * NodeStack::explore_action(ModelAction *act, enabled_type_t *is_ena
 		if (model->params.fairwindow != 0 && head_idx > (int)model->params.fairwindow)
 			prevfairness = node_list[head_idx - model->params.fairwindow];
 	}
-	node_list.push_back(new Node(act, head, model->get_num_threads(), prevfairness));
+
+	int next_threads = model->get_num_threads();
+	if (act->get_type() == THREAD_CREATE)
+		next_threads++;
+	node_list.push_back(new Node(act, head, next_threads, prevfairness));
 	total_nodes++;
 	head_idx++;
 	return NULL;
@@ -576,6 +589,7 @@ void NodeStack::pop_restofstack(int numAhead)
 	for (unsigned int i = it; i < node_list.size(); i++)
 		delete node_list[i];
 	node_list.resize(it);
+	node_list.back()->clear_backtracking();
 }
 
 Node * NodeStack::get_head() const