merge massive speedup with release sequence support...

[model-checker.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index 5351d6c7e7b4eb693f6af5bbecc8c4c41f1094ff..803d2b8e492c05a98f23a628550dd4f05265e23f 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -8,12 +8,39 @@
 #include <list>
 #include <vector>
 #include <cstddef>
-#include "threads.h"
+#include <inttypes.h>
+
 #include "mymemory.h"
+#include "modeltypes.h"
+#include "schedule.h"
 
 class ModelAction;
+class Thread;
+
+/**
+ * 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;
+};
 
-typedef std::list< ModelAction *, MyAlloc< ModelAction * > > action_set_t;
 
 /**
  * @brief A single node in a NodeStack
@@ -26,26 +53,52 @@ typedef std::list< ModelAction *, MyAlloc< ModelAction * > > action_set_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, enabled_type_t * 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);
+       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; }
 
-       void add_read_from(ModelAction *act);
+       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();
+
+       void add_read_from(const ModelAction *act);
+       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(unsigned int i);
+       bool get_promise(unsigned int i);
+       bool increment_promise();
+       bool promise_empty();
+       enabled_type_t *get_enabled_array() {return enabled_array;}
+
+       void add_relseq_break(const ModelAction *write);
+       const ModelAction * get_relseq_break();
+       bool increment_relseq_break();
+       bool relseq_break_empty();
 
        void print();
+       void print_may_read_from();
 
        MEMALLOC
 private:
@@ -54,16 +107,27 @@ private:
        ModelAction *action;
        Node *parent;
        int num_threads;
-       std::vector< bool, MyAlloc<bool> > explored_children;
-       std::vector< bool, MyAlloc<bool> > backtrack;
+       std::vector< bool, ModelAlloc<bool> > explored_children;
+       std::vector< bool, ModelAlloc<bool> > backtrack;
+       std::vector< struct fairness_info, ModelAlloc< struct fairness_info> > fairness;
        int numBacktracks;
+       enabled_type_t *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. */
-       action_set_t may_read_from;
+       std::vector< const ModelAction *, ModelAlloc< const ModelAction * > > may_read_from;
+
+       unsigned int read_from_index;
+
+       std::vector< struct future_value, ModelAlloc<struct future_value> > future_values;
+       std::vector< promise_t, ModelAlloc<promise_t> > promises;
+       int future_index;
+
+       std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > relseq_break_writes;
+       int relseq_break_index;
 };
 
-typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
+typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;
 
 /**
  * @brief A stack of nodes
@@ -77,11 +141,11 @@ class NodeStack {
 public:
        NodeStack();
        ~NodeStack();
-       ModelAction * explore_action(ModelAction *act);
+       ModelAction * explore_action(ModelAction *act, enabled_type_t * is_enabled);
        Node * get_head();
        Node * get_next();
        void reset_execution();
-
+       void pop_restofstack(int numAhead);
        int get_total_nodes() { return total_nodes; }
 
        void print();
@@ -89,7 +153,7 @@ public:
        MEMALLOC
 private:
        node_list_t node_list;
-       node_list_t::iterator iter;
+       unsigned int iter;
 
        int total_nodes;
 };