cyclegraph: improve comments, use initializer list

[model-checker.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index 6f7807f66f97626cb96b816bd9c7c86fd4d07dbe..fc3bf1d0911c8e43da840332ffa0b41758431fd9 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -14,6 +14,8 @@
 class ModelAction;
 
 typedef std::vector< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
+typedef std::vector< uint64_t, MyAlloc< uint64_t > > futurevalues_t;
+typedef std::vector< uint32_t, MyAlloc< uint32_t > > promises_t;
 
 /**
  * @brief A single node in a NodeStack
@@ -32,7 +34,7 @@ public:
        bool has_been_explored(thread_id_t tid);
        /* return true = backtrack set is empty */
        bool backtrack_empty();
-       bool readsfrom_empty();
+
        void explore_child(ModelAction *act);
        /* return false = thread was already in backtrack */
        bool set_backtrack(thread_id_t id);
@@ -44,9 +46,20 @@ public:
         * occurred previously in the stack. */
        Node * get_parent() const { return parent; }
 
+       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(uint32_t i);
+       bool get_promise(uint32_t i);
+       bool increment_promise();
+       bool promise_empty();
 
        void print();
        void print_may_read_from();
@@ -66,6 +79,10 @@ private:
         *  from. Only meaningful if this Node represents a 'read' action. */
        readfrom_set_t may_read_from;
        unsigned int read_from_index;
+
+       futurevalues_t future_values;
+       promises_t promises;
+       unsigned int future_index;
 };
 
 typedef std::list< Node *, MyAlloc< Node * > > node_list_t;