X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=cyclegraph.h;h=716e811d64ea6ea4153572d6d9c485762b0988ef;hp=83d3db21d77cdfc192f0bd286d21fee188de7fac;hb=25d73096cfc14c655f94b01bb235cc5efd1d5696;hpb=ff29187c639cdb032debdb036d2c9062f77879b0

diff --git a/cyclegraph.h b/cyclegraph.h
index 83d3db21..716e811d 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -9,167 +9,88 @@
 #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;
-
-typedef std::vector< const Promise *, ModelAlloc<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();
-
-	template <typename T, typename U>
-	void addEdge(const T from, const U to);
-
-	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;
-
-	void startChanges();
-	void commitChanges();
-	void rollbackChanges();
+	void addEdges(SnapList<ModelAction *> * edgeset, ModelAction *to);
+	void addEdge(ModelAction *from, ModelAction *to);
+	void addEdge(ModelAction *from, ModelAction *to, bool forceedge);
+	void addRMWEdge(ModelAction *from, ModelAction *rmw);
+	bool checkReachable(const ModelAction *from, const ModelAction *to) const;
+	void freeAction(const ModelAction * act);
 #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);
+	void dot_print_edge(FILE *file, const ModelAction *from, const ModelAction *to, const char *prop);
 #endif
 
-	bool resolvePromise(ModelAction *reader, ModelAction *writer,
-			promise_list_t *mustResolve);
-
+	CycleNode * getNode_noCreate(const ModelAction *act) const;
 	SNAPSHOTALLOC
- private:
-	void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+private:
+	void addNodeEdge(CycleNode *fromnode, CycleNode *tonode, bool forceedge);
 	void putNode(const ModelAction *act, CycleNode *node);
-	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);
-
-	HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
+	CycleNode * getNode(ModelAction *act);
 
 	/** @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;
+	SnapVector<const CycleNode *> * queue;
 
 #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;
-	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:
-	CycleNode(const ModelAction *act);
-	CycleNode(const Promise *promise);
-	bool addEdge(CycleNode *node);
+public:
+	CycleNode(ModelAction *act);
+	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();
-
+	CycleNode * getInEdge(unsigned int i) const;
+	unsigned int getNumInEdges() const;
 	bool setRMW(CycleNode *);
 	CycleNode * getRMW() const;
 	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);
+	ModelAction * getAction() const { return action; }
+	void removeInEdge(CycleNode *src);
+	void removeEdge(CycleNode *dst);
+	~CycleNode();
 
 	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;
+	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;
+	/** @brief The edges leading in from this node */
+	SnapVector<CycleNode *> inedges;
 
 	/** 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);
-}
-
-/**
- * Checks whether one ModelAction can reach another ModelAction/Promise
- * @param from The ModelAction from which to begin exploration
- * @param to The ModelAction or Promise to reach
- * @return True, @a from can reach @a to; otherwise, false
- */
-template <typename T>
-bool CycleGraph::checkReachable(const ModelAction *from, const T *to) const
-{
-	CycleNode *fromnode = getNode_noCreate(from);
-	CycleNode *tonode = getNode_noCreate(to);
 
-	if (!fromnode || !tonode)
-		return false;
-
-	return checkReachable(fromnode, tonode);
-}
+	/** ClockVector for this Node. */
+	ClockVector *cv;
+	friend class CycleGraph;
+};
 
-#endif /* __CYCLEGRAPH_H__ */
+#endif	/* __CYCLEGRAPH_H__ */