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.
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);
* 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);
DBG();
ASSERT(!node_list.empty());
+ node_list_t::iterator it=iter;
+ it++;
- if (get_head()->has_been_explored(act->get_tid())) {
+ if (it != node_list.end()) {
iter++;
return (*iter)->get_action();
}
- /* Diverging from previous execution; clear out remainder of list */
- node_list_t::iterator it = iter;
- it++;
- clear_node_list(&node_list, it, node_list.end());
-
/* Record action */
get_head()->explore_child(act);
node_list.push_back(new Node(act, get_head(), model->get_num_threads()));
return NULL;
}
+
+void NodeStack::pop_restofstack()
+{
+ /* Diverging from previous execution; clear out remainder of list */
+ node_list_t::iterator it = iter;
+ it++;
+ clear_node_list(&node_list, it, node_list.end());
+}
+
+
Node * NodeStack::get_head()
{
if (node_list.empty())