~CycleGraph();
void addEdge(const ModelAction *from, const ModelAction *to);
bool checkForCycles() const;
- bool checkForRMWViolation() 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;
SNAPSHOTALLOC
private:
+ void addEdge(CycleNode *fromnode, CycleNode *tonode);
void putNode(const ModelAction *act, CycleNode *node);
CycleNode * getNode(const ModelAction *);
HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
bool hasCycles;
bool oldCycles;
- bool hasRMWViolation;
- bool oldRMWViolation;
-
std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rollbackvector;
std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rmwrollbackvector;
};
-/** @brief A node within a CycleGraph; corresponds to one ModelAction */
+/**
+ * @brief A node within a CycleGraph; corresponds either to one ModelAction or
+ * to a promised future value
+ */
class CycleNode {
public:
CycleNode(const ModelAction *act);
+ CycleNode(const Promise *promise);
bool addEdge(CycleNode *node);
CycleNode * getEdge(unsigned int i) const;
unsigned int getNumEdges() const;
unsigned int getNumBackEdges() const;
bool setRMW(CycleNode *);
CycleNode * getRMW() const;
+ void clearRMW() { hasRMW = NULL; }
const ModelAction * getAction() const { return action; }
void popEdge() {
edges.pop_back();
}
- void clearRMW() {
- hasRMW = NULL;
- }
+
+ bool is_promise() const { return !action; }
SNAPSHOTALLOC
private:
/** @brief The ModelAction that this node represents */
const ModelAction *action;
+ /** @brief The promise represented by this node; only valid when action
+ * is NULL */
+ const Promise *promise;
+
/** @brief The edges leading out from this node */
std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > edges;