X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=7e7d180e0c1bd7a73de4653b657896f5a1df3a29;hb=2d0d4ac38e05905a6633b3f2d5112ccadd45c27f;hp=3f1c9330b4b14631fe70959a0827e70a8d2139bd;hpb=438b20cfc07029629c03b4f219c190cbdb5b9d1b;p=model-checker.git

diff --git a/cyclegraph.h b/cyclegraph.h
index 3f1c933..7e7d180 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -9,20 +9,18 @@
 #ifndef __CYCLEGRAPH_H__
 #define __CYCLEGRAPH_H__
 
-#include <vector>
 #include <inttypes.h>
 #include <stdio.h>
 
 #include "hashtable.h"
 #include "config.h"
 #include "mymemory.h"
+#include "stl-model.h"
 
 class Promise;
 class CycleNode;
 class ModelAction;
 
-typedef std::vector< const Promise *, ModelAlloc<const Promise *> > promise_list_t;
-
 /** @brief A graph of Model Actions for tracking cycles. */
 class CycleGraph {
  public:
@@ -68,6 +66,8 @@ class CycleGraph {
 	bool mergeNodes(CycleNode *node1, CycleNode *node2);
 
 	HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
+	ModelVector<const CycleNode *> * queue;
+
 
 	/** @brief A table for mapping ModelActions to CycleNodes */
 	HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
@@ -75,17 +75,18 @@ class CycleGraph {
 	HashTable<const Promise *, CycleNode *, uintptr_t, 4> promiseToNode;
 
 #if SUPPORT_MOD_ORDER_DUMP
-	std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > nodeList;
+	SnapVector<CycleNode *> nodeList;
 #endif
 
 	bool checkReachable(const CycleNode *from, const CycleNode *to) const;
 
 	/** @brief A flag: true if this graph contains cycles */
 	bool hasCycles;
+	/** @brief The previous value of CycleGraph::hasCycles, for rollback */
 	bool oldCycles;
 
-	std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rollbackvector;
-	std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rmwrollbackvector;
+	SnapVector<CycleNode *> rollbackvector;
+	SnapVector<CycleNode *> rmwrollbackvector;
 };
 
 /**
@@ -122,10 +123,10 @@ class CycleNode {
 	const Promise *promise;
 
 	/** @brief The edges leading out from this node */
-	std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > edges;
+	SnapVector<CycleNode *> edges;
 
 	/** @brief The edges leading into this node */
-	std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > back_edges;
+	SnapVector<CycleNode *> back_edges;
 
 	/** Pointer to a RMW node that reads from this node, or NULL, if none
 	 * exists */