X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=bb2ab2d87b4370065ff64fa9dfcac45e86f2ce39;hb=82df62c2b0805848b87bb71df5b66a4a66f8e25d;hp=c9c575ab36cdce5c8e9bc8445b0bce21837d8f99;hpb=776fc7207dec4959b4fa3e4bd7cb71cc38a19353;p=model-checker.git

diff --git a/cyclegraph.h b/cyclegraph.h
index c9c575a..bb2ab2d 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -28,14 +28,16 @@ class CycleGraph {
 	~CycleGraph();
 
 	template <typename T, typename U>
-	void addEdge(const T from, const U to);
+	bool addEdge(const T *from, const U *to);
+
+	template <typename T>
+	void addRMWEdge(const T *from, const ModelAction *rmw);
 
 	bool checkForCycles() const;
-	void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
 	bool checkPromise(const ModelAction *from, Promise *p) const;
 
-	template <typename T>
-	bool checkReachable(const ModelAction *from, const T *to) const;
+	template <typename T, typename U>
+	bool checkReachable(const T *from, const U *to) const;
 
 	void startChanges();
 	void commitChanges();
@@ -50,10 +52,14 @@ class CycleGraph {
 
 	SNAPSHOTALLOC
  private:
-	void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+	bool addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
 	void putNode(const ModelAction *act, CycleNode *node);
-	CycleNode * getNode(const ModelAction *);
+	void putNode(const Promise *promise, CycleNode *node);
+	void erasePromiseNode(const Promise *promise);
+	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);
 
@@ -100,11 +106,6 @@ class CycleNode {
 	void clearRMW() { hasRMW = NULL; }
 	const ModelAction * getAction() const { return action; }
 	const Promise * getPromise() const { return promise; }
-
-	void popEdge() {
-		edges.pop_back();
-	}
-
 	bool is_promise() const { return !action; }
 	void resolvePromise(const ModelAction *writer);