node: do not use static member variable

[model-checker.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index eebfa5ba1c0c8c4771bb625e490fb6dbfeb97c16..59da8a1f1f04971f709cfe0dd7b79d187ed4593b 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -11,7 +11,7 @@ class ModelAction;
 
 class Node {
 public:
-       Node(ModelAction *act = NULL, Node *parent = NULL);
+       Node(ModelAction *act = NULL, int nthreads = 1);
        ~Node();
        /* return true = thread choice has already been explored */
        bool has_been_explored(thread_id_t tid);
@@ -26,13 +26,10 @@ public:
 
        void print();
 
-       static int get_total_nodes() { return total_nodes; }
-
        MEMALLOC
 private:
        void explore(thread_id_t tid);
 
-       static int total_nodes;
        ModelAction *action;
        int num_threads;
        std::vector< bool, MyAlloc<bool> > explored_children;
@@ -50,12 +47,16 @@ public:
        Node * get_next();
        void reset_execution();
 
+       int get_total_nodes() { return total_nodes; }
+
        void print();
 
        MEMALLOC
 private:
        node_list_t node_list;
        node_list_t::iterator iter;
+
+       int total_nodes;
 };
 
 #endif /* __NODESTACK_H__ */