public:
CycleGraph();
~CycleGraph();
-
- template <typename T, typename U>
- bool addEdge(const T *from, const U *to);
-
- template <typename T>
- void addRMWEdge(const T *from, const ModelAction *rmw);
-
- bool checkForCycles() const;
-
- template <typename T, typename U>
- bool checkReachable(const T *from, const U *to) const;
-
- void startChanges();
- void commitChanges();
- void rollbackChanges();
+ void addEdges(SnapList<ModelAction *> * edgeset, ModelAction *to);
+ void addEdge(ModelAction *from, ModelAction *to);
+ void addEdge(ModelAction *from, ModelAction *to, bool forceedge);
+ void addRMWEdge(ModelAction *from, ModelAction *rmw);
+ bool checkReachable(const ModelAction *from, const ModelAction *to) const;
+ void freeAction(const ModelAction * act);
#if SUPPORT_MOD_ORDER_DUMP
void dumpNodes(FILE *file) const;
void dumpGraphToFile(const char *filename) const;
-
void dot_print_node(FILE *file, const ModelAction *act);
- template <typename T, typename U>
- void dot_print_edge(FILE *file, const T *from, const U *to, const char *prop);
+ void dot_print_edge(FILE *file, const ModelAction *from, const ModelAction *to, const char *prop);
#endif
- CycleNode * getNode_noCreate(const ModelAction *act) const;
+ CycleNode * getNode_noCreate(const ModelAction *act) const;
SNAPSHOTALLOC
private:
- bool addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+ void addNodeEdge(CycleNode *fromnode, CycleNode *tonode, bool forceedge);
void putNode(const ModelAction *act, CycleNode *node);
- CycleNode * getNode(const ModelAction *act);
- bool mergeNodes(CycleNode *node1, CycleNode *node2);
-
- HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
- ModelVector<const CycleNode *> * queue;
-
+ CycleNode * getNode(ModelAction *act);
/** @brief A table for mapping ModelActions to CycleNodes */
HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
+ SnapVector<const CycleNode *> * queue;
#if SUPPORT_MOD_ORDER_DUMP
SnapVector<CycleNode *> nodeList;
#endif
bool checkReachable(const CycleNode *from, const CycleNode *to) const;
-
- /** @brief A flag: true if this graph contains cycles */
- bool hasCycles;
- /** @brief The previous value of CycleGraph::hasCycles, for rollback */
- bool oldCycles;
-
- SnapVector<CycleNode *> rollbackvector;
- SnapVector<CycleNode *> rmwrollbackvector;
};
/**
*/
class CycleNode {
public:
- CycleNode(const ModelAction *act);
- bool addEdge(CycleNode *node);
+ CycleNode(ModelAction *act);
+ void addEdge(CycleNode *node);
CycleNode * getEdge(unsigned int i) const;
unsigned int getNumEdges() const;
- CycleNode * removeEdge();
-
+ CycleNode * getInEdge(unsigned int i) const;
+ unsigned int getNumInEdges() const;
bool setRMW(CycleNode *);
CycleNode * getRMW() const;
void clearRMW() { hasRMW = NULL; }
- const ModelAction * getAction() const { return action; }
+ ModelAction * getAction() const { return action; }
+ void removeInEdge(CycleNode *src);
+ void removeEdge(CycleNode *dst);
+ ~CycleNode();
SNAPSHOTALLOC
private:
/** @brief The ModelAction that this node represents */
- const ModelAction *action;
+ ModelAction *action;
/** @brief The edges leading out from this node */
SnapVector<CycleNode *> edges;
+ /** @brief The edges leading in from this node */
+ SnapVector<CycleNode *> inedges;
+
/** Pointer to a RMW node that reads from this node, or NULL, if none
* exists */
CycleNode *hasRMW;
+
+ /** ClockVector for this Node. */
+ ClockVector *cv;
+ friend class CycleGraph;
};
#endif /* __CYCLEGRAPH_H__ */