deal with looping due to bogus future value via promise expiration

[c11tester.git] / nodestack.cc

diff --git a/nodestack.cc b/nodestack.cc
index a88166f087722c084cc9a30bf4c64ea8d0f4404e..431baafbdce9809a2cb49ebcea30837182c852cf 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -52,19 +52,19 @@ void Node::print()
 /** @brief Prints info about may_read_from set */
 void Node::print_may_read_from()
 {
-       readfrom_set_t::iterator it;
-       for (it = may_read_from.begin(); it != may_read_from.end(); it++)
-               (*it)->print();
+       for (unsigned int i = 0; i < may_read_from.size(); i++)
+               may_read_from[i]->print();
 }
 
 /**
  * Sets a promise to explore meeting with the given node.
  * @param i is the promise index.
  */
-void Node::set_promise(uint32_t i) {
-       if (i>=promises.size())
-               promises.resize(i+1,0);
-       promises[i]=1;
+void Node::set_promise(unsigned int i) {
+       if (i >= promises.size())
+               promises.resize(i + 1, PROMISE_IGNORE);
+       if (promises[i] == PROMISE_IGNORE)
+               promises[i] = PROMISE_UNFULFILLED;
 }
 
 /**
@@ -72,8 +72,8 @@ void Node::set_promise(uint32_t i) {
  * @param i The promise index.
  * @return true if the promise should be satisfied by the given model action.
  */
-bool Node::get_promise(uint32_t i) {
-       return (i<promises.size())&&(promises[i]==2);
+bool Node::get_promise(unsigned int i) {
+       return (i < promises.size()) && (promises[i] == PROMISE_FULFILLED);
 }
 
 /**
@@ -81,13 +81,13 @@ bool Node::get_promise(uint32_t i) {
  * @return true if we have a valid combination.
  */
 bool Node::increment_promise() {
-       for (unsigned int i=0;i<promises.size();i++) {
-               if (promises[i]==1) {
-                       promises[i]=2;
-                       while (i>0) {
+       for (unsigned int i = 0; i < promises.size(); i++) {
+               if (promises[i] == PROMISE_UNFULFILLED) {
+                       promises[i] = PROMISE_FULFILLED;
+                       while (i > 0) {
                                i--;
-                               if (promises[i]==2)
-                                       promises[i]=1;
+                               if (promises[i] == PROMISE_FULFILLED)
+                                       promises[i] = PROMISE_UNFULFILLED;
                        }
                        return true;
                }
@@ -100,8 +100,8 @@ bool Node::increment_promise() {
  * @return true if we have explored all promise combinations.
  */
 bool Node::promise_empty() {
-       for (unsigned int i=0;i<promises.size();i++)
-               if (promises[i]==1)
+       for (unsigned int i = 0; i < promises.size();i++)
+               if (promises[i] == PROMISE_UNFULFILLED)
                        return false;
        return true;
 }
@@ -110,12 +110,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;
 }
 
@@ -124,10 +136,9 @@ bool Node::add_future_value(uint64_t value) {
  * @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) >= future_values.size());
 }
 
-
 /**
  * Checks if the Thread associated with this thread ID has been explored from
  * this Node already.
@@ -150,17 +161,14 @@ bool Node::backtrack_empty()
        return (numBacktracks == 0);
 }
 
-
 /**
  * Checks whether the readsfrom set for this node is empty.
  * @return true if the readsfrom set is empty.
  */
 bool Node::read_from_empty() {
-       return ((read_from_index+1)>=may_read_from.size());
+       return ((read_from_index+1) >= may_read_from.size());
 }
 
-
-
 /**
  * Mark the appropriate backtracking information for exploring a thread choice.
  * @param act The ModelAction to explore
@@ -221,10 +229,23 @@ void Node::add_read_from(const ModelAction *act)
  * where this->action is a 'read'.
  * @return The first element in future_values
  */
-
 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];
 }
 
 /**
@@ -233,7 +254,7 @@ uint64_t Node::get_future_value() {
  * @return The first element in may_read_from
  */
 const ModelAction * Node::get_read_from() {
-       if (read_from_index<may_read_from.size())
+       if (read_from_index < may_read_from.size())
                return may_read_from[read_from_index];
        else
                return NULL;
@@ -245,7 +266,7 @@ const ModelAction * Node::get_read_from() {
  */
 bool Node::increment_read_from() {
        read_from_index++;
-       return (read_from_index<may_read_from.size());
+       return (read_from_index < may_read_from.size());
 }
 
 /**
@@ -254,7 +275,7 @@ bool Node::increment_read_from() {
  */
 bool Node::increment_future_value() {
        future_index++;
-       return (future_index<future_values.size());
+       return (future_index < future_values.size());
 }
 
 void Node::explore(thread_id_t tid)