X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=cyclegraph.h;h=556af1cfdd04627c8b9a5d70d05c3078b01c3469;hp=45e49fb7bec3950656054e02f92b06aa5cf3ae65;hb=f750120c93252f2b677c4b07d003fc71fcdaaa00;hpb=ecf4c35df39672c99e638045087266d2cd098cfa

diff --git a/cyclegraph.h b/cyclegraph.h
index 45e49fb7..556af1cf 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -9,61 +9,77 @@
 #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"
-
-class Promise;
-class CycleNode;
-class ModelAction;
+#include "stl-model.h"
+#include "classlist.h"
 
 /** @brief A graph of Model Actions for tracking cycles. */
 class CycleGraph {
  public:
 	CycleGraph();
 	~CycleGraph();
-	void addEdge(const ModelAction *from, const ModelAction *to);
+
+	template <typename T, typename U>
+	bool addEdge(const T *from, const U *to);
+
+	template <typename T>
+	void addRMWEdge(const T *from, const ModelAction *rmw);
+
 	bool checkForCycles() const;
-	bool checkForRMWViolation() const;
-	void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
-	bool checkPromise(const ModelAction *from, Promise *p) const;
-	bool checkReachable(const ModelAction *from, const ModelAction *to) const;
+
+	template <typename T, typename U>
+	bool checkReachable(const T *from, const U *to) const;
+
 	void startChanges();
 	void commitChanges();
 	void rollbackChanges();
 #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
+	CycleNode * getNode_noCreate(const ModelAction *act) const;
 
 	SNAPSHOTALLOC
  private:
+	bool addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
 	void putNode(const ModelAction *act, CycleNode *node);
-	CycleNode * getNode(const ModelAction *);
+	CycleNode * getNode(const ModelAction *act);
+	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;
+
 #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;
 
-	bool hasRMWViolation;
-	bool oldRMWViolation;
-
-	std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rollbackvector;
-	std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rmwrollbackvector;
+	SnapVector<CycleNode *> rollbackvector;
+	SnapVector<CycleNode *> rmwrollbackvector;
 };
 
-/** @brief A node within a CycleGraph; corresponds to one ModelAction */
+/**
+ * @brief A node within a CycleGraph; corresponds either to one ModelAction
+ */
 class CycleNode {
  public:
 	CycleNode(const ModelAction *act);
@@ -72,27 +88,24 @@ class CycleNode {
 	unsigned int getNumEdges() const;
 	CycleNode * getBackEdge(unsigned int i) const;
 	unsigned int getNumBackEdges() const;
+	CycleNode * removeEdge();
+	CycleNode * removeBackEdge();
+
 	bool setRMW(CycleNode *);
 	CycleNode * getRMW() const;
+	void clearRMW() { hasRMW = NULL; }
 	const ModelAction * getAction() const { return action; }
 
-	void popEdge() {
-		edges.pop_back();
-	}
-	void clearRMW() {
-		hasRMW = NULL;
-	}
-
 	SNAPSHOTALLOC
  private:
 	/** @brief The ModelAction that this node represents */
 	const ModelAction *action;
 
 	/** @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 */