nodestack: only create may_read_from sets for read operations

[model-checker.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index d3eab13561149cb6ca89da2d1928332ead695e4a..974f1a94ad10cefbf59d62b89575de5595879c84 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -7,15 +7,18 @@
 
 #include <list>
 #include <vector>
+#include <set>
 #include <cstddef>
 #include "threads.h"
 #include "mymemory.h"
 
 class ModelAction;
 
+typedef std::set< ModelAction *, std::less< ModelAction *>, MyAlloc< ModelAction * > > action_set_t;
+
 class Node {
 public:
-       Node(ModelAction *act = NULL, int nthreads = 1);
+       Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1);
        ~Node();
        /* return true = thread choice has already been explored */
        bool has_been_explored(thread_id_t tid);
@@ -28,6 +31,12 @@ public:
        bool is_enabled(Thread *t);
        ModelAction * get_action() { return action; }
 
+       /** @return the parent Node to this Node; that is, the action that
+        * occurred previously in the stack. */
+       Node * get_parent() const { return parent; }
+
+       void add_read_from(ModelAction *act);
+
        void print();
 
        MEMALLOC
@@ -35,9 +44,15 @@ private:
        void explore(thread_id_t tid);
 
        ModelAction *action;
+       Node *parent;
        int num_threads;
        std::vector< bool, MyAlloc<bool> > explored_children;
        std::vector< bool, MyAlloc<bool> > backtrack;
+       int numBacktracks;
+
+       /** The set of ModelActions that this the action at this Node may read
+        *  from. Only meaningful if this Node represents a 'read' action. */
+       action_set_t *may_read_from;
 };
 
 typedef std::list<class Node *, MyAlloc< class Node * > > node_list_t;