From: Brian Norris <banorris@uci.edu>
Date: Tue, 29 Jan 2013 02:30:28 +0000 (-0800)
Subject: cyclegraph: rename addEdge() to addNodeEdge()
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=79c9efc15ba00325f4da4d9d8a96a4042046260d

cyclegraph: rename addEdge() to addNodeEdge()

This is a "low-level" internal function, where the other addEdge()
implementations will be high-level, external interfaces. Differentiate
the names, then.
---

diff --git a/cyclegraph.cc b/cyclegraph.cc
index 57f8fc8c..89c3f2ca 100644
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -60,7 +60,7 @@ void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to)
 	CycleNode *fromnode = getNode(from);
 	CycleNode *tonode = getNode(to);
 
-	addEdge(fromnode, tonode);
+	addNodeEdge(fromnode, tonode);
 }
 
 /**
@@ -68,7 +68,7 @@ void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to)
  * @param fromnode The edge comes from this CycleNode
  * @param tonode The edge points to this CycleNode
  */
-void CycleGraph::addEdge(CycleNode *fromnode, CycleNode *tonode)
+void CycleGraph::addNodeEdge(CycleNode *fromnode, CycleNode *tonode)
 {
 	if (!hasCycles)
 		hasCycles = checkReachable(tonode, fromnode);
@@ -131,7 +131,7 @@ void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw)
 		}
 	}
 
-	addEdge(fromnode, rmwnode);
+	addNodeEdge(fromnode, rmwnode);
 }
 
 #if SUPPORT_MOD_ORDER_DUMP
diff --git a/cyclegraph.h b/cyclegraph.h
index a909c10b..5c49992e 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -39,7 +39,7 @@ class CycleGraph {
 
 	SNAPSHOTALLOC
  private:
-	void addEdge(CycleNode *fromnode, CycleNode *tonode);
+	void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
 	void putNode(const ModelAction *act, CycleNode *node);
 	CycleNode * getNode(const ModelAction *);
 	HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;