~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>
- bool checkReachable(const ModelAction *from, const T *to) const;
+ template <typename T, typename U>
+ bool checkReachable(const T *from, const U *to) const;
void startChanges();
void commitChanges();
SNAPSHOTALLOC
private:
- void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+ bool addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
void putNode(const ModelAction *act, CycleNode *node);
+ void putNode(const Promise *promise, CycleNode *node);
+ void erasePromiseNode(const Promise *promise);
CycleNode * getNode(const ModelAction *act);
CycleNode * getNode(const Promise *promise);
CycleNode * getNode_noCreate(const ModelAction *act) const;
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);
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__ */