cyclegraph: template-ize addRMWEdge()

[model-checker.git] / cyclegraph.h

diff --git a/cyclegraph.h b/cyclegraph.h
index 9fc789c1913edd590f59c497f6cee1ff0b59eff2..a9e46120f1f3efac17efacb9a608abca451868d4 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -28,10 +28,12 @@ class CycleGraph {
        ~CycleGraph();
 
        template <typename T, typename U>
-       void addEdge(const T from, const U to);
+       bool addEdge(const T from, const U to);
+
+       template <typename T>
+       void addRMWEdge(const T *from, const ModelAction *rmw);
 
        bool checkForCycles() const;
-       void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
        bool checkPromise(const ModelAction *from, Promise *p) const;
 
        template <typename T>
@@ -50,7 +52,7 @@ class CycleGraph {
 
        SNAPSHOTALLOC
  private:
-       void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+       bool addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
        void putNode(const ModelAction *act, CycleNode *node);
        CycleNode * getNode(const ModelAction *act);
        CycleNode * getNode(const Promise *promise);
@@ -102,11 +104,6 @@ class CycleNode {
        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);
 
@@ -141,9 +138,10 @@ class CycleNode {
  *
  * @param to The edge points to this object, of type T
  * @param from The edge comes from this object, of type U
+ * @return True, if new edge(s) are added; otherwise false
  */
 template <typename T, typename U>
-void CycleGraph::addEdge(const T from, const U to)
+bool CycleGraph::addEdge(const T from, const U to)
 {
        ASSERT(from);
        ASSERT(to);
@@ -151,7 +149,25 @@ void CycleGraph::addEdge(const T from, const U to)
        CycleNode *fromnode = getNode(from);
        CycleNode *tonode = getNode(to);
 
-       addNodeEdge(fromnode, tonode);
+       return 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);
 }
 
 #endif /* __CYCLEGRAPH_H__ */