projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
optimize hashtable so we don't always build new ones for cyclegraph check
[c11tester.git]
/
cyclegraph.cc
diff --git
a/cyclegraph.cc
b/cyclegraph.cc
index 33f8cda85cedacffdea92d344be05ddf4f4b10e4..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),
@@
-182,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();
@@
-194,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);
}
}
@@
-205,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();
@@
-221,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);
}
}