X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.cc;h=23e87ac690a79c334da6a9f8ed85a269ce073116;hb=5a44bb763cbcb85792ea59b07175a56342b63c59;hp=3db80e8f6b4f8931ad3a238215c4294c86cd9708;hpb=b8b39c87557325a384faa45d0cae56a6f71f52b1;p=model-checker.git

diff --git a/nodestack.cc b/nodestack.cc
index 3db80e8..23e87ac 100644
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -4,7 +4,7 @@
 #include "action.h"
 #include "common.h"
 #include "model.h"
-#include "threads.h"
+#include "threads-model.h"
 
 /**
  * @brief Node constructor
@@ -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->enabled_array[i]==THREAD_ENABLED) {
+				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->enabled_array[i] == THREAD_ENABLED)
+					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.
@@ -242,6 +262,7 @@ void Node::explore_child(ModelAction *act, enabled_type_t * is_enabled)
 bool Node::set_backtrack(thread_id_t id)
 {
 	int i = id_to_int(id);
+	ASSERT(i<((int)backtrack.size()));
 	if (backtrack[i])
 		return false;
 	backtrack[i] = true;
@@ -296,12 +317,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;
 }
 
@@ -409,6 +430,7 @@ bool Node::relseq_break_empty() {
 void Node::explore(thread_id_t tid)
 {
 	int i = id_to_int(tid);
+	ASSERT(i<((int)backtrack.size()));
 	if (backtrack[i]) {
 		backtrack[i] = false;
 		numBacktracks--;