1) Add more comments.

[model-checker.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index 3a0ee74cf0c47a3717997d7a47c04d0a9b824b4f..d3eab13561149cb6ca89da2d1928332ead695e4a 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -1,3 +1,7 @@
+/** @file nodestack.h
+ *  @brief Stack of operations for use in backtracking.
+*/
+
 #ifndef __NODESTACK_H__
 #define __NODESTACK_H__
 
@@ -11,7 +15,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,20 +30,17 @@ 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> explored_children;
-       std::vector<bool> backtrack;
+       std::vector< bool, MyAlloc<bool> > explored_children;
+       std::vector< bool, MyAlloc<bool> > backtrack;
 };
 
-typedef std::list<class Node *> node_list_t;
+typedef std::list<class Node *, MyAlloc< class Node * > > node_list_t;
 
 class NodeStack {
 public:
@@ -50,12 +51,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__ */