projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: add a "pending release sequences" test
[model-checker.git]
/
cyclegraph.cc
diff --git
a/cyclegraph.cc
b/cyclegraph.cc
index ecf8a781c2770ebd09766cff47030e3e094bd2d7..321ebe9e2f242babe1adad4e233dd7fe51427e71 100644
(file)
--- a/
cyclegraph.cc
+++ b/
cyclegraph.cc
@@
-41,6
+41,7
@@
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);
@@
-82,6
+83,7
@@
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);
@@
-120,11
+122,7
@@
void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) {
}
#if SUPPORT_MOD_ORDER_DUMP
}
#if SUPPORT_MOD_ORDER_DUMP
-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);
+void CycleGraph::dumpNodes(FILE *file) {
for(unsigned int i=0;i<nodeList.size();i++) {
CycleNode *cn=nodeList[i];
std::vector<CycleNode *> * edges=cn->getEdges();
for(unsigned int i=0;i<nodeList.size();i++) {
CycleNode *cn=nodeList[i];
std::vector<CycleNode *> * edges=cn->getEdges();
@@
-139,6
+137,14
@@
void CycleGraph::dumpGraphToFile(const char *filename) {
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];
+ sprintf(buffer, "%s.dot",filename);
+ FILE *file=fopen(buffer, "w");
+ fprintf(file, "digraph %s {\n",filename);
+ dumpNodes(file);
fprintf(file,"}\n");
fclose(file);
}
fprintf(file,"}\n");
fclose(file);
}
@@
-168,7
+174,7
@@
bool CycleGraph::checkReachable(const ModelAction *from, const ModelAction *to)
*/
bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
std::vector<CycleNode *, MyAlloc<CycleNode *> > queue;
*/
bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
std::vector<CycleNode *, MyAlloc<CycleNode *> > queue;
- HashTable<CycleNode *, CycleNode *, uintptr_t, 4,
MYMALLOC, MYCALLOC, MYFREE
> discovered;
+ HashTable<CycleNode *, CycleNode *, uintptr_t, 4,
model_malloc, model_calloc, model_free
> discovered;
queue.push_back(from);
discovered.put(from, from);
queue.push_back(from);
discovered.put(from, from);