libthreads: don't spin on THREAD_JOIN

[model-checker.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index 0e952417b16c87a484712a94de4953bebc984d96..b440b11d58e3242b359a45be8fdac52267c99726 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -13,7 +13,18 @@
 
 class ModelAction;
 
-typedef std::list< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_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;
 
 /**
  * @brief A single node in a NodeStack
@@ -32,6 +43,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);
@@ -43,9 +55,23 @@ 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(unsigned int i);
+       bool get_promise(unsigned int i);
+       bool increment_promise();
+       bool promise_empty();
 
        void print();
+       void print_may_read_from();
 
        MEMALLOC
 private:
@@ -60,7 +86,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. */
-       readfrom_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< promise_t, MyAlloc<promise_t> > promises;
+       unsigned int future_index;
 };
 
 typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
@@ -81,7 +113,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();