X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=cyclegraph.h;h=83d3db21d77cdfc192f0bd286d21fee188de7fac;hp=c0bd7d66167aea6bd71fa323efb29e18a57dfac4;hb=ff29187c639cdb032debdb036d2c9062f77879b0;hpb=d3dffe991352938e5c2ab738ce70e3ec0f069d5f

diff --git a/cyclegraph.h b/cyclegraph.h
index c0bd7d66..83d3db21 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -33,7 +33,10 @@ class CycleGraph {
 	bool checkForCycles() const;
 	void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
 	bool checkPromise(const ModelAction *from, Promise *p) const;
-	bool checkReachable(const ModelAction *from, const ModelAction *to) const;
+
+	template <typename T>
+	bool checkReachable(const ModelAction *from, const T *to) const;
+
 	void startChanges();
 	void commitChanges();
 	void rollbackChanges();
@@ -49,8 +52,10 @@ class CycleGraph {
  private:
 	void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
 	void putNode(const ModelAction *act, CycleNode *node);
-	CycleNode * getNode(const ModelAction *);
+	CycleNode * getNode(const ModelAction *act);
 	CycleNode * getNode(const Promise *promise);
+	CycleNode * getNode_noCreate(const ModelAction *act) const;
+	CycleNode * getNode_noCreate(const Promise *promise) const;
 	bool mergeNodes(CycleNode *node1, CycleNode *node2,
 			promise_list_t *mustMerge);
 
@@ -125,4 +130,46 @@ class CycleNode {
 	CycleNode *hasRMW;
 };
 
+/*
+ * @brief Adds an edge between objects
+ *
+ * This function will add an edge between any two objects which can be
+ * associated with a CycleNode. That is, if they have a CycleGraph::getNode
+ * implementation.
+ *
+ * The object to is ordered after the object from.
+ *
+ * @param to The edge points to this object, of type T
+ * @param from The edge comes from this object, of type U
+ */
+template <typename T, typename U>
+void CycleGraph::addEdge(const T from, const U to)
+{
+	ASSERT(from);
+	ASSERT(to);
+
+	CycleNode *fromnode = getNode(from);
+	CycleNode *tonode = getNode(to);
+
+	addNodeEdge(fromnode, tonode);
+}
+
+/**
+ * Checks whether one ModelAction can reach another ModelAction/Promise
+ * @param from The ModelAction from which to begin exploration
+ * @param to The ModelAction or Promise to reach
+ * @return True, @a from can reach @a to; otherwise, false
+ */
+template <typename T>
+bool CycleGraph::checkReachable(const ModelAction *from, const T *to) const
+{
+	CycleNode *fromnode = getNode_noCreate(from);
+	CycleNode *tonode = getNode_noCreate(to);
+
+	if (!fromnode || !tonode)
+		return false;
+
+	return checkReachable(fromnode, tonode);
+}
+
 #endif /* __CYCLEGRAPH_H__ */