X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=d9fa631879b361923ea3cf6f9bc21740983b0acf;hb=61fb4abad48596608278bfb8c3c78c0861a5978b;hp=5cf709324a863d51e4ec45956093600460495232;hpb=20926923f6de1790fdd368d5e7fa1738abe7b9a6;p=c11tester.git

diff --git a/cyclegraph.h b/cyclegraph.h
index 5cf70932..d9fa6318 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -8,7 +8,10 @@
 #include "hashtable.h"
 #include <vector>
 #include <inttypes.h>
+#include "config.h"
+#include "mymemory.h"
 
+class Promise;
 class CycleNode;
 class ModelAction;
 
@@ -19,26 +22,70 @@ class CycleGraph {
 	~CycleGraph();
 	void addEdge(const ModelAction *from, const ModelAction *to);
 	bool checkForCycles();
-	void addRMWEdge(const ModelAction *from, const ModelAction *to);
+	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);
+
+	/** @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;
 };
 
+/** @brief A node within a CycleGraph; corresponds to one ModelAction */
 class CycleNode {
  public:
 	CycleNode(const ModelAction *action);
-	void addEdge(CycleNode * node);
-	std::vector<CycleNode *> * getEdges();
+	bool addEdge(CycleNode * node);
+	CycleNode * getEdge(unsigned int i) const;
+	unsigned int getNumEdges() const;
 	bool setRMW(CycleNode *);
 	CycleNode* getRMW();
+	const ModelAction * getAction() {return action;};
+
+	void popEdge() {
+		edges.pop_back();
+	};
+	void clearRMW() {
+		hasRMW=NULL;
+	}
 
+	SNAPSHOTALLOC
  private:
+	/** @brief The ModelAction that this node represents */
 	const ModelAction *action;
-	std::vector<CycleNode *> edges;
+
+	/** @brief The edges leading out from this node */
+	std::vector<CycleNode *, SnapshotAlloc<CycleNode *> > edges;
+
+	/** Pointer to a RMW node that reads from this node, or NULL, if none
+	 * exists */
 	CycleNode * hasRMW;
 };