X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=1cc0d069531e6499aed90a3972bfd1ff533c3c8f;hb=6b87c110fbda87ccec4f58b1e292d5f9434c8691;hp=ed534170fd339ee42427535d38e3979e6d4cf496;hpb=f7e1577b22ac26c12dc57a43de2761aa9249227c;p=model-checker.git

diff --git a/cyclegraph.h b/cyclegraph.h
index ed53417..1cc0d06 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -1,37 +1,90 @@
+/** @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
 
 #include "hashtable.h"
-#include "action.h"
 #include <vector>
+#include <inttypes.h>
+#include "config.h"
+#include "mymemory.h"
 
+class Promise;
 class CycleNode;
+class ModelAction;
 
 /** @brief A graph of Model Actions for tracking cycles. */
 class CycleGraph {
  public:
 	CycleGraph();
-	void addEdge(ModelAction *from, ModelAction *to);
+	~CycleGraph();
+	void addEdge(const ModelAction *from, const ModelAction *to);
 	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(ModelAction *);
-	HashTable<class ModelAction *, class CycleNode *, uintptr_t, 4> actionToNode;
+	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;
 };
 
+/** @brief A node within a CycleGraph; corresponds to one ModelAction */
 class CycleNode {
  public:
-	CycleNode(ModelAction *action);
-	void addEdge(CycleNode * node);
-	std::vector<class CycleNode *> * getEdges();
+	CycleNode(const ModelAction *action);
+	bool addEdge(CycleNode * node);
+	std::vector<CycleNode *> * getEdges();
+	bool setRMW(CycleNode *);
+	CycleNode* getRMW();
+	const ModelAction * getAction() {return action;};
+
+	void popEdge() {
+		edges.pop_back();
+	};
+	void clearRMW() {
+		hasRMW=NULL;
+	}
 
+	SNAPSHOTALLOC
  private:
-	ModelAction *action;
- 	std::vector<class CycleNode *> edges;
+	/** @brief The ModelAction that this node represents */
+	const ModelAction *action;
+
+	/** @brief The edges leading out from this node */
+	std::vector<CycleNode *> edges;
+
+	/** Pointer to a RMW node that reads from this node, or NULL, if none
+	 * exists */
+	CycleNode * hasRMW;
 };
 
 #endif