X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=cyclegraph.h;h=7e7d180e0c1bd7a73de4653b657896f5a1df3a29;hp=9fc789c1913edd590f59c497f6cee1ff0b59eff2;hb=b02e5f980b66f92801bc2e93db05940ac5ac7c5e;hpb=096afcb50341ae3e0b8fccb4ee06881086bc0953

diff --git a/cyclegraph.h b/cyclegraph.h
index 9fc789c..7e7d180 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -9,18 +9,18 @@
 #ifndef __CYCLEGRAPH_H__
 #define __CYCLEGRAPH_H__
 
-#include "hashtable.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:
@@ -28,14 +28,16 @@ class CycleGraph {
 	~CycleGraph();
 
 	template <typename T, typename U>
-	void addEdge(const T from, const U to);
+	bool addEdge(const T *from, const U *to);
+
+	template <typename T>
+	void addRMWEdge(const T *from, const ModelAction *rmw);
 
 	bool checkForCycles() const;
-	void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
 	bool checkPromise(const ModelAction *from, Promise *p) const;
 
-	template <typename T>
-	bool checkReachable(const ModelAction *from, const T *to) const;
+	template <typename T, typename U>
+	bool checkReachable(const T *from, const U *to) const;
 
 	void startChanges();
 	void commitChanges();
@@ -43,42 +45,48 @@ class CycleGraph {
 #if SUPPORT_MOD_ORDER_DUMP
 	void dumpNodes(FILE *file) const;
 	void dumpGraphToFile(const char *filename) const;
+
+	void dot_print_node(FILE *file, const ModelAction *act);
+	template <typename T, typename U>
+	void dot_print_edge(FILE *file, const T *from, const U *to, const char *prop);
 #endif
 
-	bool resolvePromise(ModelAction *reader, ModelAction *writer,
-			promise_list_t *mustResolve);
+	bool resolvePromise(const Promise *promise, ModelAction *writer);
 
 	SNAPSHOTALLOC
  private:
-	void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+	bool addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
 	void putNode(const ModelAction *act, CycleNode *node);
+	void putNode(const Promise *promise, CycleNode *node);
+	void erasePromiseNode(const Promise *promise);
 	CycleNode * getNode(const ModelAction *act);
 	CycleNode * getNode(const Promise *promise);
 	CycleNode * getNode_noCreate(const ModelAction *act) const;
 	CycleNode * getNode_noCreate(const Promise *promise) const;
-	bool mergeNodes(CycleNode *node1, CycleNode *node2,
-			promise_list_t *mustMerge);
+	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;
-	/** @brief A table for mapping reader ModelActions to Promise
-	 *  CycleNodes */
-	HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> readerToPromiseNode;
+	/** @brief A table for mapping Promises to CycleNodes */
+	HashTable<const Promise *, CycleNode *, uintptr_t, 4> promiseToNode;
 
 #if SUPPORT_MOD_ORDER_DUMP
-	std::vector<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;
 };
 
 /**
@@ -102,11 +110,6 @@ class CycleNode {
 	void clearRMW() { hasRMW = NULL; }
 	const ModelAction * getAction() const { return action; }
 	const Promise * getPromise() const { return promise; }
-
-	void popEdge() {
-		edges.pop_back();
-	}
-
 	bool is_promise() const { return !action; }
 	void resolvePromise(const ModelAction *writer);
 
@@ -120,38 +123,14 @@ 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 */
 	CycleNode *hasRMW;
 };
 
-/*
- * @brief Adds an edge between objects
- *
- * This function will add an edge between any two objects which can be
- * associated with a CycleNode. That is, if they have a CycleGraph::getNode
- * implementation.
- *
- * The object to is ordered after the object from.
- *
- * @param to The edge points to this object, of type T
- * @param from The edge comes from this object, of type U
- */
-template <typename T, typename U>
-void CycleGraph::addEdge(const T from, const U to)
-{
-	ASSERT(from);
-	ASSERT(to);
-
-	CycleNode *fromnode = getNode(from);
-	CycleNode *tonode = getNode(to);
-
-	addNodeEdge(fromnode, tonode);
-}
-
 #endif /* __CYCLEGRAPH_H__ */