X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=cyclegraph.h;h=e2b586403994b5573c863d4825857e7945d28c8d;hp=d5c6a92af78715de0ff4f2c323a578b7a43f6ff1;hb=241f7577895a5c74aad14d9903b6c25ea02e217d;hpb=7524803854c2de38c0311fe5037e3c17105ccfaa

diff --git a/cyclegraph.h b/cyclegraph.h
index d5c6a92a..e2b58640 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -9,129 +9,80 @@
 #ifndef __CYCLEGRAPH_H__
 #define __CYCLEGRAPH_H__
 
-#include "stl_wrappers.h"
 #include <inttypes.h>
 #include <stdio.h>
 
 #include "hashtable.h"
 #include "config.h"
 #include "mymemory.h"
-
-class Promise;
-class CycleNode;
-class ModelAction;
-
-typedef model_vector< const Promise * > promise_list_t;
+#include "stl-model.h"
+#include "classlist.h"
 
 /** @brief A graph of Model Actions for tracking cycles. */
 class CycleGraph {
- public:
+public:
 	CycleGraph();
 	~CycleGraph();
+	void addEdge(const ModelAction *from, const ModelAction *to);
+	void addEdge(const ModelAction *from, const ModelAction *to, bool forceedge);
+	void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
+	bool checkReachable(const ModelAction *from, const ModelAction *to) const;
 
-	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 checkPromise(const ModelAction *from, Promise *p) 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);
+	void dot_print_edge(FILE *file, const ModelAction *from, const ModelAction *to, const char *prop);
 #endif
 
-	bool resolvePromise(const Promise *promise, ModelAction *writer);
-
+	CycleNode * getNode_noCreate(const ModelAction *act) const;
 	SNAPSHOTALLOC
- private:
-	bool addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+private:
+	void addNodeEdge(CycleNode *fromnode, CycleNode *tonode, bool forceedge);
 	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);
-
-	HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
-	model_vector< const CycleNode * > * queue;
-
 
 	/** @brief A table for mapping ModelActions to CycleNodes */
 	HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
-	/** @brief A table for mapping Promises to CycleNodes */
-	HashTable<const Promise *, CycleNode *, uintptr_t, 4> promiseToNode;
+	SnapVector<const CycleNode *> * queue;
 
 #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;
-	bool oldCycles;
-
-	std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rollbackvector;
-	std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rmwrollbackvector;
 };
 
 /**
- * @brief A node within a CycleGraph; corresponds either to one ModelAction or
- * to a promised future value
+ * @brief A node within a CycleGraph; corresponds either to one ModelAction
  */
 class CycleNode {
- public:
+public:
 	CycleNode(const ModelAction *act);
-	CycleNode(const Promise *promise);
-	bool addEdge(CycleNode *node);
+	void addEdge(CycleNode *node);
 	CycleNode * getEdge(unsigned int i) const;
 	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; }
-	const Promise * getPromise() const { return promise; }
-	bool is_promise() const { return !action; }
-	void resolvePromise(const ModelAction *writer);
 
 	SNAPSHOTALLOC
- private:
+private:
 	/** @brief The ModelAction that this node represents */
 	const ModelAction *action;
 
-	/** @brief The promise represented by this node; only valid when action
-	 * is NULL */
-	const Promise *promise;
-
 	/** @brief The edges leading out from this node */
-	std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > edges;
-
-	/** @brief The edges leading into this node */
-	std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > back_edges;
+	SnapVector<CycleNode *> edges;
 
 	/** Pointer to a RMW node that reads from this node, or NULL, if none
 	 * exists */
 	CycleNode *hasRMW;
+
+	/** ClockVector for this Node. */
+	ClockVector *cv;
+	friend class CycleGraph;
 };
 
-#endif /* __CYCLEGRAPH_H__ */
+#endif	/* __CYCLEGRAPH_H__ */