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

diff --git a/nodestack.cc b/nodestack.cc
index 72c8d5c..a850478 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
@@ -49,7 +49,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(i)) {
 					fi->enabled_count++;
 				}
 				if (i==currtid) {
@@ -58,7 +58,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(i))
 						fi->enabled_count--;
 					if (i==prevtid) {
 						fi->turns--;
@@ -267,13 +267,13 @@ thread_id_t Node::get_next_backtrack()
 bool Node::is_enabled(Thread *t)
 {
 	int thread_id=id_to_int(t->get_id());
-	return thread_id < num_threads && (enabled_array[thread_id] == THREAD_ENABLED);
+	return thread_id < num_threads && (enabled_array[thread_id] != THREAD_DISABLED);
 }
 
 bool Node::is_enabled(thread_id_t tid)
 {
 	int thread_id=id_to_int(tid);
-	return thread_id < num_threads && (enabled_array[thread_id] == THREAD_ENABLED);
+	return thread_id < num_threads && (enabled_array[thread_id] != THREAD_DISABLED);
 }
 
 bool Node::has_priority(thread_id_t tid)