projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
threads/model: allocate Thread from w/in ModelChecker
[model-checker.git]
/
cyclegraph.h
diff --git
a/cyclegraph.h
b/cyclegraph.h
index e7e9380bb7e67e195d3d2ab95b587a44aa0234aa..bb2ab2d87b4370065ff64fa9dfcac45e86f2ce39 100644
(file)
--- a/
cyclegraph.h
+++ b/
cyclegraph.h
@@
-19,6
+19,8
@@
class Promise;
class CycleNode;
class ModelAction;
class CycleNode;
class ModelAction;
+typedef std::vector< const Promise *, ModelAlloc<const Promise *> > promise_list_t;
+
/** @brief A graph of Model Actions for tracking cycles. */
class CycleGraph {
public:
/** @brief A graph of Model Actions for tracking cycles. */
class CycleGraph {
public:
@@
-26,12
+28,17
@@
class CycleGraph {
~CycleGraph();
template <typename T, typename U>
~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;
bool checkForCycles() const;
- void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
bool checkPromise(const ModelAction *from, Promise *p) const;
bool checkPromise(const ModelAction *from, Promise *p) const;
- bool checkReachable(const ModelAction *from, const ModelAction *to) const;
+
+ template <typename T, typename U>
+ bool checkReachable(const T *from, const U *to) const;
+
void startChanges();
void commitChanges();
void rollbackChanges();
void startChanges();
void commitChanges();
void rollbackChanges();
@@
-40,12
+47,21
@@
class CycleGraph {
void dumpGraphToFile(const char *filename) const;
#endif
void dumpGraphToFile(const char *filename) const;
#endif
+ bool resolvePromise(ModelAction *reader, ModelAction *writer,
+ promise_list_t *mustResolve);
+
SNAPSHOTALLOC
private:
SNAPSHOTALLOC
private:
-
void
addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+
bool
addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
void putNode(const ModelAction *act, CycleNode *node);
void putNode(const ModelAction *act, CycleNode *node);
- CycleNode * getNode(const ModelAction *);
+ void putNode(const Promise *promise, CycleNode *node);
+ void erasePromiseNode(const Promise *promise);
+ CycleNode * getNode(const ModelAction *act);
CycleNode * getNode(const Promise *promise);
CycleNode * getNode(const Promise *promise);
+ CycleNode * getNode_noCreate(const ModelAction *act) const;
+ CycleNode * getNode_noCreate(const Promise *promise) const;
+ bool mergeNodes(CycleNode *node1, CycleNode *node2,
+ promise_list_t *mustMerge);
HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
@@
-90,11
+106,6
@@
class CycleNode {
void clearRMW() { hasRMW = NULL; }
const ModelAction * getAction() const { return action; }
const Promise * getPromise() const { return promise; }
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);
bool is_promise() const { return !action; }
void resolvePromise(const ModelAction *writer);