X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=c8e8956be10529d194304061f8f90a6c48181181;hb=96cc6915859876bd9a5c1774a5195058c7c2442c;hp=0bb01c4c15ec608aa06a1892103635c4973ed039;hpb=8574719911b1f66fbcbaedef47eebb84b860d526;p=model-checker.git

diff --git a/cyclegraph.h b/cyclegraph.h
index 0bb01c4..c8e8956 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -8,6 +8,8 @@
 #include "hashtable.h"
 #include <vector>
 #include <inttypes.h>
+#include "config.h"
+#include "mymemory.h"
 
 class CycleNode;
 class ModelAction;
@@ -19,25 +21,36 @@ class CycleGraph {
 	~CycleGraph();
 	void addEdge(const ModelAction *from, const ModelAction *to);
 	bool checkForCycles();
+	bool checkForRMWViolation();
 	void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
 
 	bool checkReachable(const ModelAction *from, const ModelAction *to);
+	void startChanges();
 	void commitChanges();
 	void rollbackChanges();
+#if SUPPORT_MOD_ORDER_DUMP
+	void dumpGraphToFile(const char * filename);
+#endif
 
+	SNAPSHOTALLOC
  private:
 	CycleNode * getNode(const ModelAction *);
 
 	/** @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);
 
 	/** @brief A flag: true if this graph contains cycles */
 	bool hasCycles;
-
 	bool oldCycles;
 
+	bool hasRMWViolation;
+	bool oldRMWViolation;
+
 	std::vector<CycleNode *> rollbackvector;
 	std::vector<CycleNode *> rmwrollbackvector;
 };
@@ -46,10 +59,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();
 	};
@@ -57,6 +72,7 @@ class CycleNode {
 		hasRMW=NULL;
 	}
 
+	SNAPSHOTALLOC
  private:
 	/** @brief The ModelAction that this node represents */
 	const ModelAction *action;