cyclegraph: edit template for addEdge

[model-checker.git] / cyclegraph.h

diff --git a/cyclegraph.h b/cyclegraph.h
index e7e9380bb7e67e195d3d2ab95b587a44aa0234aa..9fc789c1913edd590f59c497f6cee1ff0b59eff2 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -19,6 +19,8 @@ class Promise;
 class CycleNode;
 class ModelAction;
 
+typedef std::vector< const Promise *, ModelAlloc<const Promise *> > promise_list_t;
+
 /** @brief A graph of Model Actions for tracking cycles. */
 class CycleGraph {
  public:
@@ -31,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();
@@ -40,12 +45,19 @@ class CycleGraph {
        void dumpGraphToFile(const char *filename) const;
 #endif
 
+       bool resolvePromise(ModelAction *reader, ModelAction *writer,
+                       promise_list_t *mustResolve);
+
        SNAPSHOTALLOC
  private:
        void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
        void putNode(const ModelAction *act, CycleNode *node);
-       CycleNode * getNode(const ModelAction *);
+       CycleNode * getNode(const ModelAction *act);
        CycleNode * getNode(const Promise *promise);
+       CycleNode * getNode_noCreate(const ModelAction *act) const;
+       CycleNode * getNode_noCreate(const Promise *promise) const;
+       bool mergeNodes(CycleNode *node1, CycleNode *node2,
+                       promise_list_t *mustMerge);
 
        HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
 
@@ -118,4 +130,28 @@ class CycleNode {
        CycleNode *hasRMW;
 };
 
+/*
+ * @brief Adds an edge between objects
+ *
+ * This function will add an edge between any two objects which can be
+ * associated with a CycleNode. That is, if they have a CycleGraph::getNode
+ * implementation.
+ *
+ * The object to is ordered after the object from.
+ *
+ * @param to The edge points to this object, of type T
+ * @param from The edge comes from this object, of type U
+ */
+template <typename T, typename U>
+void CycleGraph::addEdge(const T from, const U to)
+{
+       ASSERT(from);
+       ASSERT(to);
+
+       CycleNode *fromnode = getNode(from);
+       CycleNode *tonode = getNode(to);
+
+       addNodeEdge(fromnode, tonode);
+}
+
 #endif /* __CYCLEGRAPH_H__ */