action: add 'reads_from' member variable

[c11tester.git] / nodestack.cc

diff --git a/nodestack.cc b/nodestack.cc
index f74a2938992078a9eeaabc90e9a5100da8b7fabf..2416ed7c5b35d23deadd2f2681cd890a926e7f98 100644 (file)
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -46,6 +46,14 @@ void Node::print()
                printf("******** empty action ********\n");
 }
 
+/** @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();
+}
+
 /**
  * Checks if the Thread associated with this thread ID has been explored from
  * this Node already.
@@ -117,11 +125,27 @@ bool Node::is_enabled(Thread *t)
  * Add an action to the may_read_from set.
  * @param act is the action to add
  */
-void Node::add_read_from(ModelAction *act)
+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);