X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=cyclegraph.h;h=716e811d64ea6ea4153572d6d9c485762b0988ef;hp=f0f04ffee0c3ca1f9cd3ef2edf46c2743e6c0515;hb=ef795ab915a9311fc24c7ea7048f40d0a3bb34b3;hpb=dbb1bb205f35f076cf2d82ec443415d858b22e2f

diff --git a/cyclegraph.h b/cyclegraph.h
index f0f04ffe..716e811d 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -1,91 +1,96 @@
-/** @file cyclegraph.h @brief Data structure to track ordering
- *  constraints on modification order.  The idea is to see whether a
- *  total order exists that satisfies the ordering constriants.*/
+/**
+ * @file cyclegraph.h
+ * @brief Data structure to track ordering constraints on modification order
+ *
+ * Used to determine whether a total order exists that satisfies the ordering
+ * constraints.
+ */
 
-#ifndef CYCLEGRAPH_H
-#define CYCLEGRAPH_H
+#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:
+public:
 	CycleGraph();
 	~CycleGraph();
-	void addEdge(const ModelAction *from, const ModelAction *to);
-	bool checkForCycles();
-	bool checkForRMWViolation();
-	void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
-	bool checkPromise(const ModelAction *from, Promise *p);
-	bool checkReachable(const ModelAction *from, const ModelAction *to);
-	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);
-	void dumpGraphToFile(const char * filename);
+	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
 
+	CycleNode * getNode_noCreate(const ModelAction *act) const;
 	SNAPSHOTALLOC
- private:
-	CycleNode * getNode(const ModelAction *);
-	HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> * discovered;
+private:
+	void addNodeEdge(CycleNode *fromnode, CycleNode *tonode, bool forceedge);
+	void putNode(const ModelAction *act, CycleNode *node);
+	CycleNode * getNode(ModelAction *act);
 
 	/** @brief A table for mapping ModelActions to CycleNodes */
 	HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
+	SnapVector<const CycleNode *> * queue;
+
 #if SUPPORT_MOD_ORDER_DUMP
-	std::vector<CycleNode *> nodeList;
+	SnapVector<CycleNode *> nodeList;
 #endif
 
-	bool checkReachable(CycleNode *from, CycleNode *to);
-
-	/** @brief A flag: true if this graph contains cycles */
-	bool hasCycles;
-	bool oldCycles;
-
-	bool hasRMWViolation;
-	bool oldRMWViolation;
-
-	std::vector<CycleNode *> rollbackvector;
-	std::vector<CycleNode *> rmwrollbackvector;
+	bool checkReachable(const CycleNode *from, const CycleNode *to) const;
 };
 
-/** @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 *action);
-	bool addEdge(CycleNode * node);
-	std::vector<CycleNode *> * getEdges();
+public:
+	CycleNode(ModelAction *act);
+	void addEdge(CycleNode *node);
+	CycleNode * getEdge(unsigned int i) const;
+	unsigned int getNumEdges() const;
+	CycleNode * getInEdge(unsigned int i) const;
+	unsigned int getNumInEdges() const;
 	bool setRMW(CycleNode *);
-	CycleNode* getRMW();
-	const ModelAction * getAction() {return action;};
-
-	void popEdge() {
-		edges.pop_back();
-	};
-	void clearRMW() {
-		hasRMW=NULL;
-	}
+	CycleNode * getRMW() const;
+	void clearRMW() { hasRMW = NULL; }
+	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;
+	ModelAction *action;
 
 	/** @brief The edges leading out from this node */
-	std::vector<CycleNode *> edges;
+	SnapVector<CycleNode *> 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;
+	CycleNode *hasRMW;
+
+	/** ClockVector for this Node. */
+	ClockVector *cv;
+	friend class CycleGraph;
 };
 
-#endif
+#endif	/* __CYCLEGRAPH_H__ */