#ifndef __CYCLEGRAPH_H__
#define __CYCLEGRAPH_H__
-#include "hashtable.h"
-#include <vector>
#include <inttypes.h>
+#include <stdio.h>
+
+#include "hashtable.h"
#include "config.h"
#include "mymemory.h"
-
-class Promise;
-class CycleNode;
-class ModelAction;
+#include "stl-model.h"
+#include "classlist.h"
/** @brief A graph of Model Actions for tracking cycles. */
class CycleGraph {
- public:
+public:
CycleGraph();
~CycleGraph();
+ void addEdges(SnapList<ModelAction *> * edgeset, const ModelAction *to);
void addEdge(const ModelAction *from, const ModelAction *to);
- bool checkForCycles() const;
- bool checkForRMWViolation() const;
+ void addEdge(const ModelAction *from, const ModelAction *to, bool forceedge);
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;
- void startChanges();
- void commitChanges();
- void rollbackChanges();
+
#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);
+ void dot_print_edge(FILE *file, const ModelAction *from, const ModelAction *to, const char *prop);
#endif
+ CycleNode * getNode_noCreate(const ModelAction *act) const;
SNAPSHOTALLOC
- private:
- CycleNode * getNode(const ModelAction *);
- HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
+private:
+ void addNodeEdge(CycleNode *fromnode, CycleNode *tonode, bool forceedge);
+ void putNode(const ModelAction *act, CycleNode *node);
+ CycleNode * getNode(const 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
- std::vector<CycleNode *> nodeList;
+ SnapVector<CycleNode *> nodeList;
#endif
- bool checkReachable(CycleNode *from, CycleNode *to) const;
-
- /** @brief A flag: true if this graph contains cycles */
- bool hasCycles;
- bool oldCycles;
-
- bool hasRMWViolation;
- bool oldRMWViolation;
-
- std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rollbackvector;
- std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rmwrollbackvector;
+ bool checkReachable(const CycleNode *from, const CycleNode *to) const;
};
-/** @brief A node within a CycleGraph; corresponds to one ModelAction */
+/**
+ * @brief A node within a CycleGraph; corresponds either to one ModelAction
+ */
class CycleNode {
- public:
+public:
CycleNode(const ModelAction *act);
- bool addEdge(CycleNode *node);
+ void addEdge(CycleNode *node);
CycleNode * getEdge(unsigned int i) const;
unsigned int getNumEdges() const;
+ CycleNode * removeEdge();
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;
- }
-
SNAPSHOTALLOC
- private:
+private:
/** @brief The ModelAction that this node represents */
const ModelAction *action;
/** @brief The edges leading out from this node */
- std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > edges;
+ SnapVector<CycleNode *> edges;
/** 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__ */
+#endif /* __CYCLEGRAPH_H__ */