projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cyclegraph: add removeEdge(), removeBackEdge()
[model-checker.git]
/
cyclegraph.h
diff --git
a/cyclegraph.h
b/cyclegraph.h
index 8fac5eb590c671682d48a6b8a8377bdeed21e2c2..a909c10b50a49f97453bf1f6114223400b11c4ac 100644
(file)
--- a/
cyclegraph.h
+++ b/
cyclegraph.h
@@
-1,9
+1,13
@@
-/** @file cyclegraph.h @brief Data structure to track ordering
- * constraints on modification order. The idea is to see whether a
- * total order exists that satisfies the ordering constriants.*/
+/**
+ * @file cyclegraph.h
+ * @brief Data structure to track ordering constraints on modification order
+ *
+ * Used to determine whether a total order exists that satisfies the ordering
+ * constraints.
+ */
-#ifndef
CYCLEGRAPH_H
-#define
CYCLEGRAPH_H
+#ifndef
__CYCLEGRAPH_H__
+#define
__CYCLEGRAPH_H__
#include "hashtable.h"
#include <vector>
#include "hashtable.h"
#include <vector>
@@
-21,23
+25,24
@@
class CycleGraph {
CycleGraph();
~CycleGraph();
void addEdge(const ModelAction *from, const ModelAction *to);
CycleGraph();
~CycleGraph();
void addEdge(const ModelAction *from, const ModelAction *to);
- bool checkForCycles();
- bool checkForRMWViolation();
+ bool checkForCycles() const;
void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
- bool checkPromise(const ModelAction *from, Promise *p);
- bool checkReachable(const ModelAction *from, const ModelAction *to);
+ 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 startChanges();
void commitChanges();
void rollbackChanges();
#if SUPPORT_MOD_ORDER_DUMP
- void dumpNodes(FILE *file);
- void dumpGraphToFile(const char *
filename)
;
+ void dumpNodes(FILE *file)
const
;
+ void dumpGraphToFile(const char *
filename) const
;
#endif
SNAPSHOTALLOC
private:
#endif
SNAPSHOTALLOC
private:
+ void addEdge(CycleNode *fromnode, CycleNode *tonode);
+ void putNode(const ModelAction *act, CycleNode *node);
CycleNode * getNode(const ModelAction *);
CycleNode * getNode(const ModelAction *);
- HashTable<
CycleNode *, 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;
/** @brief A table for mapping ModelActions to CycleNodes */
HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
/** @brief A table for mapping ModelActions to CycleNodes */
HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
@@
-45,48
+50,61
@@
class CycleGraph {
std::vector<CycleNode *> nodeList;
#endif
std::vector<CycleNode *> nodeList;
#endif
- bool checkReachable(
CycleNode *from, CycleNode *to)
;
+ bool checkReachable(
const CycleNode *from, const CycleNode *to) const
;
/** @brief A flag: true if this graph contains cycles */
bool hasCycles;
bool oldCycles;
/** @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;
};
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:
class CycleNode {
public:
- CycleNode(const ModelAction *action);
- bool addEdge(CycleNode * node);
+ CycleNode(const ModelAction *act);
+ CycleNode(const Promise *promise);
+ bool addEdge(CycleNode *node);
CycleNode * getEdge(unsigned int i) const;
unsigned int getNumEdges() const;
CycleNode * getEdge(unsigned int i) const;
unsigned int getNumEdges() const;
+ CycleNode * getBackEdge(unsigned int i) const;
+ unsigned int getNumBackEdges() const;
+ CycleNode * removeEdge();
+ CycleNode * removeBackEdge();
+
bool setRMW(CycleNode *);
bool setRMW(CycleNode *);
- CycleNode* getRMW();
- const ModelAction * getAction() {return action;};
+ CycleNode * getRMW() const;
+ void clearRMW() { hasRMW = NULL; }
+ const ModelAction * getAction() const { return action; }
void popEdge() {
edges.pop_back();
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;
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;
/** @brief The edges leading out from this node */
std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > edges;
+ /** @brief The edges leading into this node */
+ std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > back_edges;
+
/** Pointer to a RMW node that reads from this node, or NULL, if none
* exists */
/** Pointer to a RMW node that reads from this node, or NULL, if none
* exists */
- CycleNode *
hasRMW;
+ CycleNode *hasRMW;
};
};
-#endif
+#endif
/* __CYCLEGRAPH_H__ */