missing commit of mo_graph changes

[model-checker.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index fc3bf1d0911c8e43da840332ffa0b41758431fd9..1f7d3e4ad3fee660027e974261b8083b3a99e0c3 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -10,12 +10,34 @@
 #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;
+};
+
+struct fairness_info {
+       unsigned int enabled_count;
+       unsigned int turns;
+       bool priority;
+};
+
 
 /**
  * @brief A single node in a NodeStack
@@ -28,26 +50,29 @@ typedef std::vector< uint32_t, MyAlloc< uint32_t > > promises_t;
  */
 class Node {
 public:
-       Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1);
+       Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1, Node *prevfairness = NULL);
        ~Node();
        /* return true = thread choice has already been explored */
        bool has_been_explored(thread_id_t tid);
        /* return true = backtrack set is empty */
        bool backtrack_empty();
 
-       void explore_child(ModelAction *act);
+       void explore_child(ModelAction *act, bool * is_enabled);
        /* return false = thread was already in backtrack */
        bool set_backtrack(thread_id_t id);
        thread_id_t get_next_backtrack();
        bool is_enabled(Thread *t);
+       bool is_enabled(thread_id_t tid);
        ModelAction * get_action() { return action; }
-
+       bool has_priority(thread_id_t tid) {return fairness[id_to_int(tid)].priority;}
+       int get_num_threads() {return num_threads;}
        /** @return the parent Node to this Node; that is, the action that
         * 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();
 
@@ -55,9 +80,11 @@ public:
        const ModelAction * get_read_from();
        bool increment_read_from();
        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);
+       void set_promise(unsigned int i);
+       bool get_promise(unsigned int i);
        bool increment_promise();
        bool promise_empty();
 
@@ -73,19 +100,22 @@ private:
        int num_threads;
        std::vector< bool, MyAlloc<bool> > explored_children;
        std::vector< bool, MyAlloc<bool> > backtrack;
+       std::vector< struct fairness_info, MyAlloc< struct fairness_info> > fairness;
        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. */
-       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;
 };
 
-typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
+typedef std::vector< Node *, MyAlloc< Node * > > node_list_t;
 
 /**
  * @brief A stack of nodes
@@ -99,7 +129,7 @@ class NodeStack {
 public:
        NodeStack();
        ~NodeStack();
-       ModelAction * explore_action(ModelAction *act);
+       ModelAction * explore_action(ModelAction *act, bool * is_enabled);
        Node * get_head();
        Node * get_next();
        void reset_execution();
@@ -111,7 +141,7 @@ public:
        MEMALLOC
 private:
        node_list_t node_list;
-       node_list_t::iterator iter;
+       unsigned int iter;
 
        int total_nodes;
 };