X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=0a6f7382a69cf78dae9b4d2bf995864b599b3912;hb=24032577ab44f5adb4f072d022f70d0b0162ab90;hp=df9d46c17d108c51af33862cb1777a6b150ab515;hpb=1667e1f8017bd3f4bf5b1ef5712e3156577f99a2;p=model-checker.git

diff --git a/cyclegraph.h b/cyclegraph.h
index df9d46c..0a6f738 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -1,10 +1,17 @@
+/** @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 <vector>
 #include <inttypes.h>
+#include "config.h"
+#include "mymemory.h"
 
+class Promise;
 class CycleNode;
 class ModelAction;
 
@@ -12,27 +19,74 @@ class ModelAction;
 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<ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
+	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 *, SnapshotAlloc<CycleNode *> > rollbackvector;
+	std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rmwrollbackvector;
 };
 
+/** @brief A node within a CycleGraph; corresponds to one ModelAction */
 class CycleNode {
  public:
-	CycleNode(ModelAction *action);
-	void addEdge(CycleNode * node);
-	std::vector<CycleNode *> * getEdges();
+	CycleNode(const ModelAction *action);
+	bool addEdge(CycleNode *node);
+	CycleNode * getEdge(unsigned int i) const;
+	unsigned int getNumEdges() const;
+	bool setRMW(CycleNode *);
+	CycleNode * getRMW() const;
+	const ModelAction * getAction() const { return action; }
+
+	void popEdge() {
+		edges.pop_back();
+	}
+	void clearRMW() {
+		hasRMW = NULL;
+	}
 
+	SNAPSHOTALLOC
  private:
-	ModelAction *action;
-	std::vector<CycleNode *> edges;
+	/** @brief The ModelAction that this node represents */
+	const ModelAction *action;
+
+	/** @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;
 };
 
 #endif