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

diff --git a/cyclegraph.h b/cyclegraph.h
index e7e9380..e96e121 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -19,6 +19,8 @@ class Promise;
 class CycleNode;
 class ModelAction;
 
+typedef std::vector< const Promise *, ModelAlloc<const Promise *> > promise_list_t;
+
 /** @brief A graph of Model Actions for tracking cycles. */
 class CycleGraph {
  public:
@@ -26,12 +28,17 @@ 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;
-	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();
@@ -40,12 +47,21 @@ class CycleGraph {
 	void dumpGraphToFile(const char *filename) const;
 #endif
 
+	bool resolvePromise(ModelAction *reader, ModelAction *writer,
+			promise_list_t *mustResolve);
+
 	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);
 
 	HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
 
@@ -90,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);