X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=0a6f7382a69cf78dae9b4d2bf995864b599b3912;hb=3b08bb3248c8f63fc1c54da23da471cab0fe7239;hp=1cc0d069531e6499aed90a3972bfd1ff533c3c8f;hpb=c832cb55af09e735821ae3463bc37c29d3fa27c8;p=model-checker.git

diff --git a/cyclegraph.h b/cyclegraph.h
index 1cc0d06..0a6f738 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -31,12 +31,13 @@ class CycleGraph {
 	void rollbackChanges();
 #if SUPPORT_MOD_ORDER_DUMP
 	void dumpNodes(FILE *file);
-	void dumpGraphToFile(const char * filename);
+	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;
@@ -53,25 +54,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();
+	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
@@ -80,11 +82,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