nodestack: re-insert falsely-declared "dead code"

[c11tester.git] / nodestack.cc

diff --git a/nodestack.cc b/nodestack.cc
index 10f7a72b5ef3ff5705fdbe29771def18212ecf11..aa3a6c97d4520f1f9faee2ae7592dbaf218da490 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -109,8 +109,9 @@ thread_id_t Node::get_next_backtrack()
        for (i = 0; i < backtrack.size(); i++)
                if (backtrack[i] == true)
                        break;
-       if (i >= backtrack.size())
-               return THREAD_ID_T_NONE;
+       /* Backtrack set was empty? */
+       ASSERT(i != backtrack.size());
+
        backtrack[i] = false;
        numBacktracks--;
        return int_to_id(i);
@@ -130,6 +131,22 @@ void Node::add_read_from(const ModelAction *act)
        may_read_from.push_back(act);
 }
 
+/**
+ * Gets the next 'may_read_from' action from this Node. Only valid for a node
+ * where this->action is a 'read'.
+ * @todo Perform reads_from backtracking/replay properly, so that this function
+ * may remove elements from may_read_from
+ * @return The first element in may_read_from
+ */
+const ModelAction * Node::get_next_read_from() {
+       const ModelAction *act;
+       ASSERT(!may_read_from.empty());
+       act = may_read_from.front();
+       /* TODO: perform reads_from replay properly */
+       /* may_read_from.pop_front(); */
+       return act;
+}
+
 void Node::explore(thread_id_t tid)
 {
        int i = id_to_int(tid);