X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=81d736962dcb6893c8ef213b9571454c24ac5ea6;hb=f82a95581e303d67ea57de4ae9e888be10558866;hp=690170022b3746c878c253d46eb58cc102f5c50c;hpb=37c87f91496ff3e713003c21692c63b8e87d81fb;p=model-checker.git

diff --git a/cyclegraph.h b/cyclegraph.h
index 6901700..81d7369 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -1,3 +1,7 @@
+/** @file cyclegraph.h @brief Data structure to track ordering
+ *  constraints on modification order.  The idea is to see whether a
+ *  total order exists that satisfies the ordering constriants.*/
+
 #ifndef CYCLEGRAPH_H
 #define CYCLEGRAPH_H
 
@@ -5,6 +9,8 @@
 #include <vector>
 #include <inttypes.h>
 
+#include "mymemory.h"
+
 class CycleNode;
 class ModelAction;
 
@@ -15,26 +21,60 @@ 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 checkReachable(const ModelAction *from, const ModelAction *to);
+	void startChanges();
+	void commitChanges();
+	void rollbackChanges();
 
+	SNAPSHOTALLOC
  private:
 	CycleNode * getNode(const ModelAction *);
+
+	/** @brief A table for mapping ModelActions to CycleNodes */
 	HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
+
 	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 setRMW();
+	bool setRMW(CycleNode *);
+	CycleNode* getRMW();
+	void popEdge() {
+		edges.pop_back();
+	};
+	void clearRMW() {
+		hasRMW=NULL;
+	}
 
+	SNAPSHOTALLOC
  private:
+	/** @brief The ModelAction that this node represents */
 	const ModelAction *action;
+
+	/** @brief The edges leading out from this node */
 	std::vector<CycleNode *> edges;
-	bool hasRMW;
+
+	/** Pointer to a RMW node that reads from this node, or NULL, if none
+	 * exists */
+	CycleNode * hasRMW;
 };
 
 #endif