start towards adding support for mutexes

[c11tester.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index b391645b3af7a458e9271fc1bd60d762c5935605..6cd8cfd30806c7463d6710e5251041bf4b64cd81 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -10,6 +10,7 @@
 #include <cstddef>
 #include "threads.h"
 #include "mymemory.h"
+#include "clockvector.h"
 
 class ModelAction;
 
@@ -26,6 +27,12 @@ typedef enum {
        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
  *
@@ -37,7 +44,7 @@ typedef enum {
  */
 class Node {
 public:
-       Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1);
+       Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1, bool *enabled_array = NULL);
        ~Node();
        /* return true = thread choice has already been explored */
        bool has_been_explored(thread_id_t tid);
@@ -55,8 +62,9 @@ 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();
+       modelclock_t get_future_value_expiration();
        bool increment_future_value();
        bool future_value_empty();
 
@@ -85,6 +93,7 @@ private:
        std::vector< bool, MyAlloc<bool> > explored_children;
        std::vector< bool, MyAlloc<bool> > backtrack;
        int numBacktracks;
+       bool *enabled_array;
 
        /** The set of ModelActions that this the action at this Node may read
         *  from. Only meaningful if this Node represents a 'read' action. */
@@ -92,7 +101,7 @@ private:
 
        unsigned int read_from_index;
 
-       std::vector< uint64_t, MyAlloc< uint64_t > > future_values;
+       std::vector< struct future_value, MyAlloc<struct future_value> > future_values;
        std::vector< promise_t, MyAlloc<promise_t> > promises;
        unsigned int future_index;
 };
@@ -111,7 +120,7 @@ class NodeStack {
 public:
        NodeStack();
        ~NodeStack();
-       ModelAction * explore_action(ModelAction *act);
+       ModelAction * explore_action(ModelAction *act, bool * enabled);
        Node * get_head();
        Node * get_next();
        void reset_execution();