nodestack: eliminate get_future_value_expiration()

[model-checker.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index f6d3e4e36be07a0ffa0feec975181faacd283f4f..55991c3022a50dc67e51ca607f3ca33e3e638ce2 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -5,7 +5,6 @@
 #ifndef __NODESTACK_H__
 #define __NODESTACK_H__
 
-#include <list>
 #include <vector>
 #include <cstddef>
 #include <inttypes.h>
@@ -44,7 +43,6 @@ struct fairness_info {
        bool priority;
 };
 
-
 /**
  * @brief A single node in a NodeStack
  *
@@ -56,7 +54,7 @@ struct fairness_info {
  */
 class Node {
 public:
-       Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 2, Node *prevfairness = NULL);
+       Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness);
        ~Node();
        /* return true = thread choice has already been explored */
        bool has_been_explored(thread_id_t tid) const;
@@ -79,8 +77,7 @@ public:
        Node * get_parent() const { return parent; }
 
        bool add_future_value(uint64_t value, modelclock_t expiration);
-       uint64_t get_future_value() const;
-       modelclock_t get_future_value_expiration() const;
+       struct future_value get_future_value() const;
        bool increment_future_value();
        bool future_value_empty() const;
 
@@ -89,7 +86,7 @@ public:
        bool increment_read_from();
        bool read_from_empty() const;
        int get_read_from_size() const;
-       const ModelAction * get_read_from_at(int i);
+       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;
@@ -114,9 +111,9 @@ public:
 private:
        void explore(thread_id_t tid);
 
-       ModelAction *action;
-       Node *parent;
-       int num_threads;
+       ModelAction * const 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;
@@ -171,7 +168,7 @@ private:
         * @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.
+        * current head Node. It is negative when the list is empty.
         */
        int head_idx;