remove another field

[c11tester.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index 7e88912e3e071de7f47e5a139e105a5a61d11869..06d98663152b15e12b7dedcaa7d93de867a0a065 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -5,39 +5,23 @@
 #ifndef __NODESTACK_H__
 #define __NODESTACK_H__
 
-#include <vector>
 #include <cstddef>
 #include <inttypes.h>
 
 #include "mymemory.h"
 #include "schedule.h"
-#include "promise.h"
+#include "stl-model.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>
- */
-
-#define        PROMISE_IGNORE 0 /**< This promise is inapplicable; ignore it */
-#define        PROMISE_UNFULFILLED 1 /**< This promise is applicable but unfulfilled */
-#define        PROMISE_FULFILLED 2 /**< This promise is applicable and fulfilled */
-#define PROMISE_MASK 0xf
-#define PROMISE_RMW 0x10
-
-typedef int promise_t;
-
 struct fairness_info {
        unsigned int enabled_count;
        unsigned int turns;
        bool priority;
 };
 
+
 /**
  * @brief A single node in a NodeStack
  *
@@ -49,90 +33,37 @@ struct fairness_info {
  */
 class Node {
 public:
-       Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness);
+       Node(ModelAction *act, Node *par,
+                       int nthreads);
        ~Node();
-       /* return true = thread choice has already been explored */
-       bool has_been_explored(thread_id_t tid) const;
-       /* return true = backtrack set is empty */
-       bool backtrack_empty() const;
-
-       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) const;
        bool is_enabled(thread_id_t tid) const;
-       enabled_type_t enabled_status(thread_id_t tid) const;
 
        ModelAction * get_action() const { return action; }
-       bool has_priority(thread_id_t tid) const;
+       void set_uninit_action(ModelAction *act) { uninit_action = act; }
+       ModelAction * get_uninit_action() const { return uninit_action; }
+
        int get_num_threads() const { 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(const ModelAction *writer, modelclock_t expiration);
-       struct future_value get_future_value() const;
-       bool increment_future_value();
-       bool future_value_empty() const;
-
-       void add_read_from(const ModelAction *act);
-       const ModelAction * get_read_from() const;
-       bool increment_read_from();
-       bool read_from_empty() const;
-       int get_read_from_size() const;
-       const ModelAction * get_read_from_at(int i) const;
-
-       void set_promise(unsigned int i, bool is_rmw);
-       bool get_promise(unsigned int i) const;
-       bool increment_promise();
-       bool promise_empty() const;
-       enabled_type_t *get_enabled_array() {return enabled_array;}
-
-       void set_misc_max(int i);
-       int get_misc() const;
-       bool increment_misc();
-       bool misc_empty() const;
-
-       void add_relseq_break(const ModelAction *write);
-       const ModelAction * get_relseq_break() const;
-       bool increment_relseq_break();
-       bool relseq_break_empty() const;
+
 
        void print() const;
-       void print_may_read_from();
 
        MEMALLOC
 private:
-       void explore(thread_id_t tid);
-
        ModelAction * const action;
+
+       /** @brief ATOMIC_UNINIT action which was created at this Node */
+       ModelAction *uninit_action;
        Node * const parent;
        const int num_threads;
-       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. */
-       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;
-
-       int misc_index;
-       int misc_max;
 };
 
-typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;
+typedef ModelVector<Node *> node_list_t;
 
 /**
  * @brief A stack of nodes
@@ -146,11 +77,14 @@ class NodeStack {
 public:
        NodeStack();
        ~NodeStack();
-       ModelAction * explore_action(ModelAction *act, enabled_type_t * is_enabled);
+
+       void register_engine(const ModelExecution *exec);
+
+       ModelAction * explore_action(ModelAction *act);
        Node * get_head() const;
        Node * get_next() const;
        void reset_execution();
-       void pop_restofstack(int numAhead);
+       void full_reset();
        int get_total_nodes() { return total_nodes; }
 
        void print() const;
@@ -159,6 +93,11 @@ public:
 private:
        node_list_t node_list;
 
+       const struct model_params * get_params() const;
+
+       /** @brief The model-checker execution object */
+       const ModelExecution *execution;
+
        /**
         * @brief the index position of the current head Node
         *