more bugs

[model-checker.git] / nodestack.cc

diff --git a/nodestack.cc b/nodestack.cc
index 71af6ef246314b0a40d373c7388418c5f4a01c82..b79863e2abbcc443e76721360724cc1c800d9b61 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -17,7 +17,7 @@
  * @param nthreads The number of threads which exist at this point in the
  * execution trace.
  */
-Node::Node(ModelAction *act, Node *par, int nthreads)
+Node::Node(ModelAction *act, Node *par, int nthreads, bool *enabled)
        : action(act),
        parent(par),
        num_threads(nthreads),
@@ -31,6 +31,13 @@ Node::Node(ModelAction *act, Node *par, int nthreads)
 {
        if (act)
                act->set_node(this);
+       enabled_array=(bool *)MYMALLOC(sizeof(bool)*num_threads);
+       if (enabled != NULL)
+               memcpy(enabled_array, enabled, sizeof(bool)*num_threads);
+       else {
+               for(int i=0;i<num_threads;i++)
+                       enabled_array[i]=false;
+       }
 }
 
 /** @brief Node desctructor */
@@ -38,6 +45,7 @@ Node::~Node()
 {
        if (action)
                delete action;
+       MYFREE(enabled_array);
 }
 
 /** Prints debugging info for the ModelAction associated with this Node */
@@ -63,7 +71,8 @@ void Node::print_may_read_from()
 void Node::set_promise(unsigned int i) {
        if (i >= promises.size())
                promises.resize(i + 1, PROMISE_IGNORE);
-       promises[i] = PROMISE_UNFULFILLED;
+       if (promises[i] == PROMISE_IGNORE)
+               promises[i] = PROMISE_UNFULFILLED;
 }
 
 /**
@@ -109,12 +118,24 @@ bool Node::promise_empty() {
  * Adds a value from a weakly ordered future write to backtrack to.
  * @param value is the value to backtrack to.
  */
-bool Node::add_future_value(uint64_t value) {
-       for (unsigned int i = 0; i < future_values.size(); i++)
-               if (future_values[i] == value)
-                       return false;
+bool Node::add_future_value(uint64_t value, modelclock_t expiration) {
+       int suitableindex=-1;
+       for (unsigned int i = 0; i < future_values.size(); i++) {
+               if (future_values[i].value == value) {
+                       if (future_values[i].expiration>=expiration)
+                               return false;
+                       if (future_index < i) {
+                               suitableindex=i;
+                       }
+               }
+       }
 
-       future_values.push_back(value);
+       if (suitableindex!=-1) {
+               future_values[suitableindex].expiration=expiration;
+               return true;
+       }
+       struct future_value newfv={value, expiration};
+       future_values.push_back(newfv);
        return true;
 }
 
@@ -199,7 +220,8 @@ thread_id_t Node::get_next_backtrack()
 
 bool Node::is_enabled(Thread *t)
 {
-       return id_to_int(t->get_id()) < num_threads;
+       int thread_id=id_to_int(t->get_id());
+       return thread_id < num_threads && enabled_array[thread_id];
 }
 
 /**
@@ -218,13 +240,23 @@ void Node::add_read_from(const ModelAction *act)
  */
 uint64_t Node::get_future_value() {
        ASSERT(future_index<future_values.size());
-       return future_values[future_index];
+       return future_values[future_index].value;
 }
 
+modelclock_t Node::get_future_value_expiration() {
+       ASSERT(future_index<future_values.size());
+       return future_values[future_index].expiration;
+}
+
+
 int Node::get_read_from_size() {
        return may_read_from.size();
 }
 
+const ModelAction * Node::get_read_from_at(int i) {
+       return may_read_from[i];
+}
+
 /**
  * Gets the next 'may_read_from' action from this Node. Only valid for a node
  * where this->action is a 'read'.
@@ -301,7 +333,7 @@ void NodeStack::print()
        printf("............................................\n");
 }
 
-ModelAction * NodeStack::explore_action(ModelAction *act)
+ModelAction * NodeStack::explore_action(ModelAction *act, bool * is_enabled)
 {
        DBG();
 
@@ -316,7 +348,7 @@ ModelAction * NodeStack::explore_action(ModelAction *act)
 
        /* Record action */
        get_head()->explore_child(act);
-       node_list.push_back(new Node(act, get_head(), model->get_num_threads()));
+       node_list.push_back(new Node(act, get_head(), model->get_num_threads(), is_enabled));
        total_nodes++;
        iter++;
        return NULL;