cyclegraph: template-ize checkReachable()

ModelChecker will need to query the mo_graph regarding the modification
order of promised future writes.

diff --git a/cyclegraph.cc b/cyclegraph.cc
index 46b0d4ac4eb803df74d57e53148d0d463f343e26..54b91238d98b2d22155a45a838da9a3b655d376c 100644 (file)
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -275,12 +275,13 @@ void CycleGraph::dumpGraphToFile(const char *filename) const
 #endif
 
 /**
- * Checks whether one ModelAction can reach another.
+ * Checks whether one ModelAction can reach another ModelAction/Promise
  * @param from The ModelAction from which to begin exploration
- * @param to The ModelAction to reach
+ * @param to The ModelAction or Promise to reach
  * @return True, @a from can reach @a to; otherwise, false
  */
-bool CycleGraph::checkReachable(const ModelAction *from, const ModelAction *to) const
+template <typename T>
+bool CycleGraph::checkReachable(const ModelAction *from, const T *to) const
 {
        CycleNode *fromnode = actionToNode.get(from);
        CycleNode *tonode = actionToNode.get(to);

diff --git a/cyclegraph.h b/cyclegraph.h
index c0bd7d66167aea6bd71fa323efb29e18a57dfac4..c9c575ab36cdce5c8e9bc8445b0bce21837d8f99 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -33,7 +33,10 @@ class CycleGraph {
        bool checkForCycles() const;
        void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
        bool checkPromise(const ModelAction *from, Promise *p) const;
-       bool checkReachable(const ModelAction *from, const ModelAction *to) const;
+
+       template <typename T>
+       bool checkReachable(const ModelAction *from, const T *to) const;
+
        void startChanges();
        void commitChanges();
        void rollbackChanges();