remove another field

[c11tester.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index c09b628b4ffc9a8f91a7997f628f3234c1e6b7df..06d98663152b15e12b7dedcaa7d93de867a0a065 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -5,15 +5,22 @@
 #ifndef __NODESTACK_H__
 #define __NODESTACK_H__
 
-#include <list>
-#include <vector>
 #include <cstddef>
-#include "threads.h"
+#include <inttypes.h>
+
 #include "mymemory.h"
+#include "schedule.h"
+#include "stl-model.h"
 
 class ModelAction;
+class Thread;
+
+struct fairness_info {
+       unsigned int enabled_count;
+       unsigned int turns;
+       bool priority;
+};
 
-typedef std::list< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
 
 /**
  * @brief A single node in a NodeStack
@@ -26,45 +33,37 @@ typedef std::list< const ModelAction *, MyAlloc< const ModelAction * > > readfro
  */
 class Node {
 public:
-       Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1);
+       Node(ModelAction *act, Node *par,
+                       int nthreads);
        ~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);
-       /* 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);
-       ModelAction * get_action() { return action; }
 
+       bool is_enabled(Thread *t) const;
+       bool is_enabled(thread_id_t tid) const;
+
+       ModelAction * get_action() const { return action; }
+       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; }
 
-       void add_read_from(const ModelAction *act);
 
-       void print();
-       void print_may_read_from();
+
+       void print() const;
 
        MEMALLOC
 private:
-       void explore(thread_id_t tid);
-
-       ModelAction *action;
-       Node *parent;
-       int num_threads;
-       std::vector< bool, MyAlloc<bool> > explored_children;
-       std::vector< bool, MyAlloc<bool> > backtrack;
-       int numBacktracks;
-
-       /** 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;
+       ModelAction * const action;
+
+       /** @brief ATOMIC_UNINIT action which was created at this Node */
+       ModelAction *uninit_action;
+       Node * const parent;
+       const int num_threads;
 };
 
-typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
+typedef ModelVector<Node *> node_list_t;
 
 /**
  * @brief A stack of nodes
@@ -78,19 +77,34 @@ class NodeStack {
 public:
        NodeStack();
        ~NodeStack();
+
+       void register_engine(const ModelExecution *exec);
+
        ModelAction * explore_action(ModelAction *act);
-       Node * get_head();
-       Node * get_next();
+       Node * get_head() const;
+       Node * get_next() const;
        void reset_execution();
-
+       void full_reset();
        int get_total_nodes() { return total_nodes; }
 
-       void print();
+       void print() const;
 
        MEMALLOC
 private:
        node_list_t node_list;
-       node_list_t::iterator iter;
+
+       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
+        *
+        * This index is relative to node_list. The index should point to the
+        * current head Node. It is negative when the list is empty.
+        */
+       int head_idx;
 
        int total_nodes;
 };