nodestack: destroy Nodes properly in ~NodeStack()

[model-checker.git] / nodestack.cc

diff --git a/nodestack.cc b/nodestack.cc
index 23611f976dfc2c5cf35f66c65284d0e4f890b1d1..6b1d4ef9c86929fdd14d14172149abaacec96133 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -4,6 +4,7 @@
 #include "action.h"
 #include "common.h"
 #include "model.h"
+#include "threads.h"
 
 /**
  * @brief Node constructor
@@ -158,7 +159,7 @@ bool Node::add_future_value(uint64_t value, modelclock_t expiration) {
                if (future_values[i].value == value) {
                        if (future_values[i].expiration>=expiration)
                                return false;
-                       if (future_index < i) {
+                       if (future_index < ((int) i)) {
                                suitableindex=i;
                        }
                }
@@ -178,7 +179,7 @@ bool Node::add_future_value(uint64_t value, modelclock_t expiration) {
  * @return true if the future_values set is empty.
  */
 bool Node::future_value_empty() {
-       return ((future_index + 1) >= future_values.size());
+       return ((future_index + 1) >= ((int)future_values.size()));
 }
 
 /**
@@ -273,6 +274,11 @@ bool Node::is_enabled(thread_id_t tid)
        return thread_id < num_threads && enabled_array[thread_id];
 }
 
+bool Node::has_priority(thread_id_t tid)
+{
+       return fairness[id_to_int(tid)].priority;
+}
+
 /**
  * Add an action to the may_read_from set.
  * @param act is the action to add
@@ -288,12 +294,12 @@ void Node::add_read_from(const ModelAction *act)
  * @return The first element in future_values
  */
 uint64_t Node::get_future_value() {
-       ASSERT(future_index<future_values.size());
+       ASSERT(future_index<((int)future_values.size()));
        return future_values[future_index].value;
 }
 
 modelclock_t Node::get_future_value_expiration() {
-       ASSERT(future_index<future_values.size());
+       ASSERT(future_index<((int)future_values.size()));
        return future_values[future_index].expiration;
 }
 
@@ -325,8 +331,11 @@ const ModelAction * Node::get_read_from() {
 bool Node::increment_read_from() {
        DBG();
        promises.clear();
-       read_from_index++;
-       return (read_from_index < may_read_from.size());
+       if (read_from_index < may_read_from.size()) {
+               read_from_index++;
+               return read_from_index < may_read_from.size();
+       }
+       return false;
 }
 
 /**
@@ -336,8 +345,11 @@ bool Node::increment_read_from() {
 bool Node::increment_future_value() {
        DBG();
        promises.clear();
-       future_index++;
-       return (future_index < future_values.size());
+       if (future_index < ((int)future_values.size())) {
+               future_index++;
+               return (future_index < ((int)future_values.size()));
+       }
+       return false;
 }
 
 void Node::explore(thread_id_t tid)
@@ -350,16 +362,18 @@ void Node::explore(thread_id_t tid)
        explored_children[i] = true;
 }
 
-NodeStack::NodeStack()
-       : total_nodes(0)
+NodeStack::NodeStack() :
+       node_list(1, new Node()),
+       iter(0),
+       total_nodes(0)
 {
-       node_list.push_back(new Node());
        total_nodes++;
-       iter = 0;
 }
 
 NodeStack::~NodeStack()
 {
+       for (unsigned int i = 0; i < node_list.size(); i++)
+               delete node_list[i];
 }
 
 void NodeStack::print()
@@ -412,6 +426,8 @@ void NodeStack::pop_restofstack(int numAhead)
 {
        /* Diverging from previous execution; clear out remainder of list */
        unsigned int it=iter+numAhead;
+       for(unsigned int i=it;i<node_list.size();i++)
+               delete node_list[i];
        node_list.resize(it);
 }