cyclegraph: don't delete promise nodes

[model-checker.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index 90d84bd6dea21da0ab677971acdb3893e9609780..47c72678aa13cffb9294e6a7d842860136e37baf 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -5,14 +5,13 @@
 #ifndef __NODESTACK_H__
 #define __NODESTACK_H__
 
-#include <list>
 #include <vector>
 #include <cstddef>
 #include <inttypes.h>
 
 #include "mymemory.h"
-#include "modeltypes.h"
 #include "schedule.h"
+#include "promise.h"
 
 class ModelAction;
 class Thread;
@@ -33,18 +32,12 @@ class Thread;
 
 typedef int 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
  *
@@ -56,14 +49,14 @@ 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;
        /* return true = backtrack set is empty */
        bool backtrack_empty() const;
 
-       void explore_child(ModelAction *act, enabled_type_t * is_enabled);
+       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();
@@ -78,9 +71,8 @@ public:
         * occurred previously in the stack. */
        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;
+       bool add_future_value(struct future_value& fv);
+       struct future_value get_future_value() const;
        bool increment_future_value();
        bool future_value_empty() const;
 
@@ -89,7 +81,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;
@@ -107,16 +99,16 @@ public:
        bool increment_relseq_break();
        bool relseq_break_empty() const;
 
-       void print();
+       void print() const;
        void print_may_read_from();
 
        MEMALLOC
 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;
@@ -166,7 +158,14 @@ public:
        MEMALLOC
 private:
        node_list_t node_list;
-       unsigned int iter;
+
+       /**
+        * @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;
 };