X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.cc;h=06259b91c54964ba4c094af50347c11a23d9cb41;hb=fe7b400edb33255770fb47ad520afbd05d13a231;hp=a850478e95391a5eecf1ca26ee12c47e4ab4dfcb;hpb=1b793f0683aff025afe2e19519572e3599575a19;p=model-checker.git

diff --git a/nodestack.cc b/nodestack.cc
index a850478..06259b9 100644
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -34,7 +34,9 @@ Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness)
 	future_values(),
 	future_index(-1),
 	relseq_break_writes(),
-	relseq_break_index(0)
+	relseq_break_index(0),
+	misc_index(0),
+	misc_max(0)
 {
 	if (act) {
 		act->set_node(this);
@@ -49,7 +51,7 @@ Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness)
 				if (prevfi) {
 					*fi=*prevfi;
 				}
-				if (parent->is_enabled(i)) {
+				if (parent->is_enabled(int_to_id(i))) {
 					fi->enabled_count++;
 				}
 				if (i==currtid) {
@@ -58,7 +60,7 @@ Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness)
 				}
 				//Do window processing
 				if (prevfairness != NULL) {
-					if (prevfairness -> parent->is_enabled(i))
+					if (prevfairness -> parent->is_enabled(int_to_id(i)))
 						fi->enabled_count--;
 					if (i==prevtid) {
 						fi->turns--;
@@ -151,6 +153,24 @@ bool Node::promise_empty() {
 	return true;
 }
 
+
+void Node::set_misc_max(int i) {
+	misc_max=i;
+}
+
+int Node::get_misc() {
+	return misc_index;
+}
+
+bool Node::increment_misc() {
+	return (misc_index<misc_max)&&((++misc_index)<misc_max);
+}
+
+bool Node::misc_empty() {
+	return (misc_index+1)>=misc_max;
+}
+
+
 /**
  * Adds a value from a weakly ordered future write to backtrack to.
  * @param value is the value to backtrack to.
@@ -296,12 +316,12 @@ void Node::add_read_from(const ModelAction *act)
  * @return The first element in future_values
  */
 uint64_t Node::get_future_value() {
-	ASSERT(future_index<((int)future_values.size()));
+	ASSERT(future_index >= 0 && future_index<((int)future_values.size()));
 	return future_values[future_index].value;
 }
 
 modelclock_t Node::get_future_value_expiration() {
-	ASSERT(future_index<((int)future_values.size()));
+	ASSERT(future_index >= 0 && future_index<((int)future_values.size()));
 	return future_values[future_index].expiration;
 }