standardize names a little

[model-checker.git] / nodestack.cc

diff --git a/nodestack.cc b/nodestack.cc
index 6295442606612f0feff684f3657756b167239628..4ece1820ab86b35baad7c6ec1c7ee18b1a19c61b 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -27,7 +27,7 @@ Node::Node(ModelAction *act, Node *par, int nthreads)
        may_read_from(),
        read_from_index(0),
        future_values(),
-       future_index(0)
+       future_index(-1)
 {
        if (act)
                act->set_node(this);
@@ -57,16 +57,59 @@ void Node::print_may_read_from()
                (*it)->print();
 }
 
+void Node::set_promise(uint32_t i) {
+       if (i>=promises.size())
+               promises.resize(i+1,0);
+       promises[i]=1;
+}
+
+bool Node::get_promise(uint32_t i) {
+       return (promises[i]==2);
+}
+
+bool Node::increment_promise() {
+       for (unsigned int i=0;i<promises.size();i++) {
+               if (promises[i]==1) {
+                       promises[i]=2;
+                       while (i>0) {
+                               i--;
+                               if (promises[i]==2)
+                                       promises[i]=1;
+                       }
+                       return true;
+               }
+       }
+       return false;
+}
+
+bool Node::promise_empty() {
+       for (unsigned int i=0;i<promises.size();i++)
+               if (promises[i]==1)
+                       return false;
+       return true;
+}
+
 /**
  * Adds a value from a weakly ordered future write to backtrack to.
  * @param value is the value to backtrack to.
  */
 
-void Node::add_future_value(uint64_t value) {
-       for(int i=0;i<future_values.size();i++)
+bool Node::add_future_value(uint64_t value) {
+       for(unsigned int i=0;i<future_values.size();i++)
                if (future_values[i]==value)
-                       return;
+                       return false;
+
        future_values.push_back(value);
+       return true;
+}
+
+/** 
+ * Checks whether the future_values set for this node is empty.
+ * @return true if the future_values set is empty.
+ */
+
+bool Node::future_value_empty() {
+       return ((future_index+1)>=future_values.size());
 }
 
 
@@ -97,18 +140,11 @@ bool Node::backtrack_empty()
  * Checks whether the readsfrom set for this node is empty.
  * @return true if the readsfrom set is empty.
  */
-bool Node::readsfrom_empty() {
+bool Node::read_from_empty() {
        return ((read_from_index+1)>=may_read_from.size());
 }
 
-/** 
- * Checks whether the future_values set for this node is empty.
- * @return true if the future_values set is empty.
- */
 
-bool Node::futurevalues_empty() {
-       return ((future_index+1)>=future_values.size());
-}
 
 /**
  * Mark the appropriate backtracking information for exploring a thread choice.
@@ -184,8 +220,10 @@ uint64_t Node::get_future_value() {
  * @return The first element in may_read_from
  */
 const ModelAction * Node::get_read_from() {
-       ASSERT(read_from_index<may_read_from.size());
-       return may_read_from[read_from_index];
+       if (read_from_index<may_read_from.size())
+               return may_read_from[read_from_index];
+       else
+               return NULL;
 }
 
 /**
@@ -202,7 +240,7 @@ bool Node::increment_read_from() {
  * @return Returns false if we have explored all values.
  */
 
-bool Node::increment_future_values() {
+bool Node::increment_future_value() {
        future_index++;
        return (future_index<future_values.size());
 }