X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=cyclegraph.h;h=fcaa21365a6c6e5434c2f9a468e6d041036aab19;hb=fbacb5f41ada96e7b539ccc41deccb1a7e1a1ba8;hp=f03c4ecf33496314387d99c28f19dc80f3839e27;hpb=482c7447dd2f63823eb969c37dd6fb4e22991fde;p=model-checker.git diff --git a/cyclegraph.h b/cyclegraph.h index f03c4ec..fcaa213 100644 --- a/cyclegraph.h +++ b/cyclegraph.h @@ -28,10 +28,12 @@ class CycleGraph { ~CycleGraph(); template - void addEdge(const T from, const U to); + bool addEdge(const T *from, const U *to); + + template + 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 @@ -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);