missing changes

[model-checker.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index 4162ff748e778bf8affcd0ad4fb23aef910f46cd..6c9779497e71f96e0621b37e762fbb199bd0556c 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -10,12 +10,28 @@
 #include <cstddef>
 #include "threads.h"
 #include "mymemory.h"
+#include "clockvector.h"
 
 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;
+/**
+ * A flag used for the promise counting/combination problem within a node,
+ * denoting whether a particular Promise is
+ * <ol><li>@b applicable: can be satisfied by this Node's ModelAction and</li>
+ * <li>@b fulfilled: satisfied by this Node's ModelAction under the current
+ * configuration.</li></ol>
+ */
+typedef enum {
+       PROMISE_IGNORE = 0, /**< This promise is inapplicable; ignore it */
+       PROMISE_UNFULFILLED, /**< This promise is applicable but unfulfilled */
+       PROMISE_FULFILLED /**< This promise is applicable and fulfilled */
+} promise_t;
+
+struct future_value {
+       uint64_t value;
+       modelclock_t expiration;
+};
+
 
 /**
  * @brief A single node in a NodeStack
@@ -46,20 +62,23 @@ public:
         * occurred previously in the stack. */
        Node * get_parent() const { return parent; }
 
-       bool add_future_value(uint64_t value);
+       bool add_future_value(uint64_t value, modelclock_t expiration);
        uint64_t get_future_value();
-       bool increment_future_values();
-       bool futurevalues_empty();
+       modelclock_t get_future_value_expiration();
+       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 readsfrom_empty();
+       bool read_from_empty();
+       int get_read_from_size();
+       const ModelAction * get_read_from_at(int i);
 
-       void set_promise(uint32_t i);
-       bool get_promise(uint32_t i);
-       bool increment_promises();
-       bool promises_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();
@@ -77,11 +96,12 @@ private:
 
        /** The set of ModelActions that this the action at this Node may read
         *  from. Only meaningful if this Node represents a 'read' action. */
-       readfrom_set_t may_read_from;
+       std::vector< const ModelAction *, MyAlloc< const ModelAction * > > may_read_from;
+
        unsigned int read_from_index;
 
-       futurevalues_t future_values;
-       promises_t promises;
+       std::vector< struct future_value, MyAlloc<struct future_value> > future_values;
+       std::vector< promise_t, MyAlloc<promise_t> > promises;
        unsigned int future_index;
 };