Compute the threads that a paused thread my wait for

[c11tester.git] / funcnode.cc

diff --git a/funcnode.cc b/funcnode.cc
index a402ecb42a26d399a4f5d83b9a52411055041ab1..bf8971bdfbf4de48eba3a53a20323358f3594477 100644 (file)
--- a/funcnode.cc
+++ b/funcnode.cc
@@ -181,7 +181,7 @@ void FuncNode::update_tree(action_list_t * act_list)
                                read_locations->add(loc);
                                value_set_t * write_values = write_history->get(loc);
                                add_to_val_loc_map(write_values, loc);
-                               history->update_loc_func_nodes_map(loc, this);
+                               history->update_loc_rd_func_nodes_map(loc, this);
                        }
                }
        }
@@ -640,6 +640,40 @@ void FuncNode::add_out_edge(FuncNode * other)
        }
 }
 
+int FuncNode::compute_distance(FuncNode * target, int max_step)
+{
+       SnapList<FuncNode *> queue;
+       HashTable<FuncNode *, int, uintptr_t, 0> distances;
+
+       int dist = 0;
+       queue.push_back(this);
+       distances.put(this, dist);
+
+       while (!queue.empty()) {
+               FuncNode * curr = queue.front();
+               queue.pop_front();
+
+               if (curr == target)
+                       return dist;
+               else if (max_step < dist)
+                       return -1;
+
+               dist++;
+               ModelList<FuncNode *> * outEdges = curr->get_out_edges();
+               mllnode<FuncNode *> * it;
+               for (it = outEdges->begin(); it != NULL; it = it->getNext()) {
+                       FuncNode * out_node = it->getVal();
+                       if ( !distances.contains(out_node) ) {
+                               queue.push_back(out_node);
+                               distances.put(out_node, dist);
+                       }
+               }
+       }
+
+       /* Target node is unreachable */
+       return -1;
+}
+
 void FuncNode::print_predicate_tree()
 {
        model_print("digraph function_%s {\n", func_name);