nodestack, model: use uniform spacing, style

[c11tester.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index 59e545783a4f570ff852105f5d08792d562d2b03..68604675cec7363f29864b10c98e5a4788add85c 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -7,15 +7,12 @@
 
 #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;
-
 /**
  * @brief A single node in a NodeStack
  *
@@ -33,6 +30,7 @@ public:
        bool has_been_explored(thread_id_t tid);
        /* return true = backtrack set is empty */
        bool backtrack_empty();
+
        void explore_child(ModelAction *act);
        /* return false = thread was already in backtrack */
        bool set_backtrack(thread_id_t id);
@@ -44,9 +42,23 @@ public:
         * occurred previously in the stack. */
        Node * get_parent() const { return parent; }
 
-       void add_read_from(ModelAction *act);
+       bool add_future_value(uint64_t value);
+       uint64_t get_future_value();
+       bool increment_future_value();
+       bool future_value_empty();
+
+       void add_read_from(const ModelAction *act);
+       const ModelAction * get_read_from();
+       bool increment_read_from();
+       bool read_from_empty();
+
+       void set_promise(unsigned int i);
+       bool get_promise(unsigned int i);
+       bool increment_promise();
+       bool promise_empty();
 
        void print();
+       void print_may_read_from();
 
        MEMALLOC
 private:
@@ -61,7 +73,13 @@ private:
 
        /** 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;
+       std::vector< const ModelAction *, MyAlloc< const ModelAction * > > may_read_from;
+
+       unsigned int read_from_index;
+
+       std::vector< uint64_t, MyAlloc< uint64_t > > future_values;
+       std::vector< unsigned int, MyAlloc<unsigned int> > promises;
+       unsigned int future_index;
 };
 
 typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
@@ -82,7 +100,7 @@ public:
        Node * get_head();
        Node * get_next();
        void reset_execution();
-
+       void pop_restofstack(int numAhead);
        int get_total_nodes() { return total_nodes; }
 
        void print();