projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
threads: add const
[model-checker.git]
/
cyclegraph.cc
diff --git
a/cyclegraph.cc
b/cyclegraph.cc
index 2280e76e3e208b8ac6ce6e2044433c1a866d2c85..ead70ae6b38c2c687ab34c30db9659d57b68e110 100644
(file)
--- a/
cyclegraph.cc
+++ b/
cyclegraph.cc
@@
-6,6
+6,7
@@
/** Initializes a CycleGraph object. */
CycleGraph::CycleGraph() :
/** Initializes a CycleGraph object. */
CycleGraph::CycleGraph() :
+ discovered(new HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free>(16)),
hasCycles(false),
oldCycles(false),
hasRMWViolation(false),
hasCycles(false),
oldCycles(false),
hasRMWViolation(false),
@@
-43,11
+44,14
@@
CycleNode * CycleGraph::getNode(const ModelAction *action) {
void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
ASSERT(from);
ASSERT(to);
void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
ASSERT(from);
ASSERT(to);
- ASSERT(from != to);
CycleNode *fromnode=getNode(from);
CycleNode *tonode=getNode(to);
CycleNode *fromnode=getNode(from);
CycleNode *tonode=getNode(to);
+ if (!hasCycles) {
+ // Reflexive edges are cycles
+ hasCycles = (from == to);
+ }
if (!hasCycles) {
// Check for Cycles
hasCycles=checkReachable(tonode, fromnode);
if (!hasCycles) {
// Check for Cycles
hasCycles=checkReachable(tonode, fromnode);
@@
-85,7
+89,6
@@
void CycleGraph::addEdge(const ModelAction *from, const ModelAction *to) {
void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) {
ASSERT(from);
ASSERT(rmw);
void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) {
ASSERT(from);
ASSERT(rmw);
- ASSERT(from != rmw);
CycleNode *fromnode=getNode(from);
CycleNode *rmwnode=getNode(rmw);
CycleNode *fromnode=getNode(from);
CycleNode *rmwnode=getNode(rmw);
@@
-114,18
+117,22
@@
void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) {
}
}
+ if (!hasCycles) {
+ // Reflexive edges are cycles
+ hasCycles = (from == rmw);
+ }
if (!hasCycles) {
// With promises we could be setting up a cycle here if we aren't
// careful...avoid it..
hasCycles=checkReachable(rmwnode, fromnode);
}
if (!hasCycles) {
// With promises we could be setting up a cycle here if we aren't
// careful...avoid it..
hasCycles=checkReachable(rmwnode, fromnode);
}
- if(fromnode->addEdge(rmwnode))
+ if
(fromnode->addEdge(rmwnode))
rollbackvector.push_back(fromnode);
}
#if SUPPORT_MOD_ORDER_DUMP
void CycleGraph::dumpNodes(FILE *file) {
rollbackvector.push_back(fromnode);
}
#if SUPPORT_MOD_ORDER_DUMP
void CycleGraph::dumpNodes(FILE *file) {
-
for
(unsigned int i=0;i<nodeList.size();i++) {
+
for
(unsigned int i=0;i<nodeList.size();i++) {
CycleNode *cn=nodeList[i];
std::vector<CycleNode *> * edges=cn->getEdges();
const ModelAction *action=cn->getAction();
CycleNode *cn=nodeList[i];
std::vector<CycleNode *> * edges=cn->getEdges();
const ModelAction *action=cn->getAction();
@@
-133,22
+140,22
@@
void CycleGraph::dumpNodes(FILE *file) {
if (cn->getRMW()!=NULL) {
fprintf(file, "N%u -> N%u[style=dotted];\n", action->get_seq_number(), cn->getRMW()->getAction()->get_seq_number());
}
if (cn->getRMW()!=NULL) {
fprintf(file, "N%u -> N%u[style=dotted];\n", action->get_seq_number(), cn->getRMW()->getAction()->get_seq_number());
}
- for(unsigned int j=0;j<edges->size();j++) {
- CycleNode *dst=(*edges)[j];
+ for
(unsigned int j=0;j<edges->size();j++) {
+
CycleNode *dst=(*edges)[j];
const ModelAction *dstaction=dst->getAction();
const ModelAction *dstaction=dst->getAction();
- fprintf(file, "N%u -> N%u;\n", action->get_seq_number(), dstaction->get_seq_number());
- }
+
fprintf(file, "N%u -> N%u;\n", action->get_seq_number(), dstaction->get_seq_number());
+
}
}
}
void CycleGraph::dumpGraphToFile(const char *filename) {
char buffer[200];
}
}
void CycleGraph::dumpGraphToFile(const char *filename) {
char buffer[200];
- sprintf(buffer, "%s.dot",filename);
- FILE *file=fopen(buffer, "w");
- fprintf(file, "digraph %s {\n",filename);
+
sprintf(buffer, "%s.dot",filename);
+
FILE *file=fopen(buffer, "w");
+
fprintf(file, "digraph %s {\n",filename);
dumpNodes(file);
dumpNodes(file);
- fprintf(file,"}\n");
- fclose(file);
+
fprintf(file,"}\n");
+ fclose(file);
}
#endif
}
#endif
@@
-176,10
+183,10
@@
bool CycleGraph::checkReachable(const ModelAction *from, const ModelAction *to)
*/
bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
std::vector<CycleNode *, ModelAlloc<CycleNode *> > queue;
*/
bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
std::vector<CycleNode *, ModelAlloc<CycleNode *> > queue;
-
HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> discovered(64
);
+
discovered->reset(
);
queue.push_back(from);
queue.push_back(from);
- discovered
.
put(from, from);
+ discovered
->
put(from, from);
while(!queue.empty()) {
CycleNode * node=queue.back();
queue.pop_back();
while(!queue.empty()) {
CycleNode * node=queue.back();
queue.pop_back();
@@
-188,8
+195,8
@@
bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
for(unsigned int i=0;i<node->getEdges()->size();i++) {
CycleNode *next=(*node->getEdges())[i];
for(unsigned int i=0;i<node->getEdges()->size();i++) {
CycleNode *next=(*node->getEdges())[i];
- if (!discovered
.
contains(next)) {
- discovered
.
put(next,next);
+ if (!discovered
->
contains(next)) {
+ discovered
->
put(next,next);
queue.push_back(next);
}
}
queue.push_back(next);
}
}
@@
-199,12
+206,12
@@
bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise) {
std::vector<CycleNode *, ModelAlloc<CycleNode *> > queue;
bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise) {
std::vector<CycleNode *, ModelAlloc<CycleNode *> > queue;
-
HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> discovered(64
);
+
discovered->reset(
);
CycleNode *from = actionToNode.get(fromact);
queue.push_back(from);
CycleNode *from = actionToNode.get(fromact);
queue.push_back(from);
- discovered
.
put(from, from);
+ discovered
->
put(from, from);
while(!queue.empty()) {
CycleNode * node=queue.back();
queue.pop_back();
while(!queue.empty()) {
CycleNode * node=queue.back();
queue.pop_back();
@@
-215,8
+222,8
@@
bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise) {
for(unsigned int i=0;i<node->getEdges()->size();i++) {
CycleNode *next=(*node->getEdges())[i];
for(unsigned int i=0;i<node->getEdges()->size();i++) {
CycleNode *next=(*node->getEdges())[i];
- if (!discovered
.
contains(next)) {
- discovered
.
put(next,next);
+ if (!discovered
->
contains(next)) {
+ discovered
->
put(next,next);
queue.push_back(next);
}
}
queue.push_back(next);
}
}