X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=f0f04ffee0c3ca1f9cd3ef2edf46c2743e6c0515;hb=84d0cd2f078f4cb15c318a0fef2515feab570375;hp=81d736962dcb6893c8ef213b9571454c24ac5ea6;hpb=04f478b27a93b7838f58a8480b9e3e22d41688f8;p=model-checker.git

diff --git a/cyclegraph.h b/cyclegraph.h
index 81d7369..f0f04ff 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -8,9 +8,10 @@
 #include "hashtable.h"
 #include <vector>
 #include <inttypes.h>
-
+#include "config.h"
 #include "mymemory.h"
 
+class Promise;
 class CycleNode;
 class ModelAction;
 
@@ -23,18 +24,26 @@ class CycleGraph {
 	bool checkForCycles();
 	bool checkForRMWViolation();
 	void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
-
+	bool checkPromise(const ModelAction *from, Promise *p);
 	bool checkReachable(const ModelAction *from, const ModelAction *to);
 	void startChanges();
 	void commitChanges();
 	void rollbackChanges();
+#if SUPPORT_MOD_ORDER_DUMP
+	void dumpNodes(FILE *file);
+	void dumpGraphToFile(const char * filename);
+#endif
 
 	SNAPSHOTALLOC
  private:
 	CycleNode * getNode(const ModelAction *);
+	HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> * discovered;
 
 	/** @brief A table for mapping ModelActions to CycleNodes */
 	HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
+#if SUPPORT_MOD_ORDER_DUMP
+	std::vector<CycleNode *> nodeList;
+#endif
 
 	bool checkReachable(CycleNode *from, CycleNode *to);
 
@@ -53,10 +62,12 @@ class CycleGraph {
 class CycleNode {
  public:
 	CycleNode(const ModelAction *action);
-	void addEdge(CycleNode * node);
+	bool addEdge(CycleNode * node);
 	std::vector<CycleNode *> * getEdges();
 	bool setRMW(CycleNode *);
 	CycleNode* getRMW();
+	const ModelAction * getAction() {return action;};
+
 	void popEdge() {
 		edges.pop_back();
 	};