X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=dcdeb3f217deced343e4ee227741040bfc733e1e;hb=ecba3e5519898cbf612e7d4e2eaef63d1d8af7d3;hp=c8e8956be10529d194304061f8f90a6c48181181;hpb=202074f941d19cef894068e7f79d76b2df598f4b;p=model-checker.git

diff --git a/cyclegraph.h b/cyclegraph.h
index c8e8956..dcdeb3f 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -1,9 +1,13 @@
-/** @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.*/
+/**
+ * @file cyclegraph.h
+ * @brief Data structure to track ordering constraints on modification order
+ *
+ * Used to determine whether a total order exists that satisfies the ordering
+ * constraints.
+ */
 
-#ifndef CYCLEGRAPH_H
-#define CYCLEGRAPH_H
+#ifndef __CYCLEGRAPH_H__
+#define __CYCLEGRAPH_H__
 
 #include "hashtable.h"
 #include <vector>
@@ -11,6 +15,7 @@
 #include "config.h"
 #include "mymemory.h"
 
+class Promise;
 class CycleNode;
 class ModelAction;
 
@@ -20,21 +25,23 @@ class CycleGraph {
 	CycleGraph();
 	~CycleGraph();
 	void addEdge(const ModelAction *from, const ModelAction *to);
-	bool checkForCycles();
-	bool checkForRMWViolation();
+	bool checkForCycles() const;
+	bool checkForRMWViolation() const;
 	void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
-
-	bool checkReachable(const ModelAction *from, const ModelAction *to);
+	bool checkPromise(const ModelAction *from, Promise *p) const;
+	bool checkReachable(const ModelAction *from, const ModelAction *to) const;
 	void startChanges();
 	void commitChanges();
 	void rollbackChanges();
 #if SUPPORT_MOD_ORDER_DUMP
-	void dumpGraphToFile(const char * filename);
+	void dumpNodes(FILE *file) const;
+	void dumpGraphToFile(const char *filename) const;
 #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;
@@ -42,7 +49,7 @@ class CycleGraph {
 	std::vector<CycleNode *> nodeList;
 #endif
 
-	bool checkReachable(CycleNode *from, CycleNode *to);
+	bool checkReachable(CycleNode *from, CycleNode *to) const;
 
 	/** @brief A flag: true if this graph contains cycles */
 	bool hasCycles;
@@ -51,25 +58,26 @@ class CycleGraph {
 	bool hasRMWViolation;
 	bool oldRMWViolation;
 
-	std::vector<CycleNode *> rollbackvector;
-	std::vector<CycleNode *> rmwrollbackvector;
+	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(const ModelAction *action);
-	bool addEdge(CycleNode * node);
-	std::vector<CycleNode *> * getEdges();
+	CycleNode(const ModelAction *act);
+	bool addEdge(CycleNode *node);
+	CycleNode * getEdge(unsigned int i) const;
+	unsigned int getNumEdges() const;
 	bool setRMW(CycleNode *);
-	CycleNode* getRMW();
-	const ModelAction * getAction() {return action;};
+	CycleNode * getRMW() const;
+	const ModelAction * getAction() const { return action; }
 
 	void popEdge() {
 		edges.pop_back();
-	};
+	}
 	void clearRMW() {
-		hasRMW=NULL;
+		hasRMW = NULL;
 	}
 
 	SNAPSHOTALLOC
@@ -78,11 +86,11 @@ class CycleNode {
 	const ModelAction *action;
 
 	/** @brief The edges leading out from this node */
-	std::vector<CycleNode *> edges;
+	std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > edges;
 
 	/** Pointer to a RMW node that reads from this node, or NULL, if none
 	 * exists */
-	CycleNode * hasRMW;
+	CycleNode *hasRMW;
 };
 
-#endif
+#endif /* __CYCLEGRAPH_H__ */