X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.h;h=716e811d64ea6ea4153572d6d9c485762b0988ef;hb=HEAD;hp=624ce885f2aadf4543dd9505b40a4192ceb802aa;hpb=15162a2ac08b0a6b06e5319a7424055f4d12e01c;p=c11tester.git

diff --git a/cyclegraph.h b/cyclegraph.h
index 624ce885..716e811d 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -23,10 +23,12 @@ class CycleGraph {
 public:
 	CycleGraph();
 	~CycleGraph();
-	void addEdge(const ModelAction *from, const ModelAction *to);
-	void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
+	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;
@@ -37,9 +39,9 @@ public:
 	CycleNode * getNode_noCreate(const ModelAction *act) const;
 	SNAPSHOTALLOC
 private:
-	void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+	void addNodeEdge(CycleNode *fromnode, CycleNode *tonode, bool forceedge);
 	void putNode(const ModelAction *act, CycleNode *node);
-	CycleNode * getNode(const ModelAction *act);
+	CycleNode * getNode(ModelAction *act);
 
 	/** @brief A table for mapping ModelActions to CycleNodes */
 	HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
@@ -57,24 +59,31 @@ private:
  */
 class CycleNode {
 public:
-	CycleNode(const ModelAction *act);
+	CycleNode(ModelAction *act);
 	void addEdge(CycleNode *node);
 	CycleNode * getEdge(unsigned int i) const;
 	unsigned int getNumEdges() const;
-	CycleNode * removeEdge();
+	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; }
+	ModelAction * getAction() const { return action; }
+	void removeInEdge(CycleNode *src);
+	void removeEdge(CycleNode *dst);
+	~CycleNode();
 
 	SNAPSHOTALLOC
 private:
 	/** @brief The ModelAction that this node represents */
-	const ModelAction *action;
+	ModelAction *action;
 
 	/** @brief The edges leading out from this node */
 	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;