Changes needed to run on OS X... Example runs on my laptop now. No need to push...

[c11tester.git] / nodestack.cc

diff --git a/nodestack.cc b/nodestack.cc
index 4cbd7cea820fa6ce7e4764a8fd758d87621d3ec2..74e6a11a43bbeacab4cc0e3dc39a9ee0dc279760 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -1,21 +1,14 @@
 #include "nodestack.h"
 #include "action.h"
 #include "common.h"
+#include "model.h"
 
-int Node::total_nodes = 0;
-
-Node::Node(ModelAction *act, Node *parent)
+Node::Node(ModelAction *act, int nthreads)
        : action(act),
-       num_threads(parent ? parent->num_threads : 1),
+       num_threads(nthreads),
        explored_children(num_threads),
        backtrack(num_threads)
 {
-       total_nodes++;
-       if (act && act->get_type() == THREAD_CREATE) {
-               num_threads++;
-               explored_children.resize(num_threads);
-               backtrack.resize(num_threads);
-       }
 }
 
 Node::~Node()
@@ -98,8 +91,10 @@ static void clear_node_list(node_list_t *list, node_list_t::iterator start,
 }
 
 NodeStack::NodeStack()
+       : total_nodes(0)
 {
        node_list.push_back(new Node());
+       total_nodes++;
        iter = node_list.begin();
 }
 
@@ -139,8 +134,8 @@ ModelAction * NodeStack::explore_action(ModelAction *act)
 
                /* Record action */
                get_head()->explore_child(act);
-               act->create_cv(get_head()->get_action());
-               node_list.push_back(new Node(act, get_head()));
+               node_list.push_back(new Node(act, model->get_num_threads()));
+               total_nodes++;
                iter++;
        }
        return (*iter)->get_action();