X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=e96e1216c0907a0af9d7e166441f960c5b782188;hb=3e538ef764be5b82ef8a58f1fcdf98708cd8aa73;hp=9fc789c1913edd590f59c497f6cee1ff0b59eff2;hpb=096afcb50341ae3e0b8fccb4ee06881086bc0953;p=model-checker.git

diff --git a/cyclegraph.h b/cyclegraph.h
index 9fc789c..e96e121 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -28,10 +28,12 @@ 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>
@@ -50,8 +52,10 @@ class CycleGraph {
 
 	SNAPSHOTALLOC
  private:
-	void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+	bool addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
 	void putNode(const ModelAction *act, CycleNode *node);
+	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;
@@ -102,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);
 
@@ -130,28 +129,4 @@ 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);
-}
-
 #endif /* __CYCLEGRAPH_H__ */