ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-09 14:33:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

avoid poor performance due to deeply-nested branches in MultiRead::intersect

Browse Source
This commit is contained in:
Joel Dice 2009-08-04 18:28:34 -06:00
parent e9ee4a618c
commit 63fa0668ff
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/compiler.cpp
View File

@ -256,7 +256,7 @@ class Read {
value(0), event(0), eventNext(0) value(0), event(0), eventNext(0)
{ } { }
virtual bool intersect(SiteMask* mask) = 0; virtual bool intersect(SiteMask* mask, unsigned depth = 0) = 0;
virtual Value* successor() = 0; virtual Value* successor() = 0;
@ -1939,7 +1939,7 @@ class SingleRead: public Read {
next_(0), mask(mask), successor_(successor) next_(0), mask(mask), successor_(successor)
{ } { }
virtual bool intersect(SiteMask* mask) { virtual bool intersect(SiteMask* mask, unsigned) {
*mask = ::intersect(*mask, this->mask); *mask = ::intersect(*mask, this->mask);
return true; return true;
@ -2002,13 +2002,19 @@ class MultiRead: public Read {
reads(0), lastRead(0), firstTarget(0), lastTarget(0), visited(false) reads(0), lastRead(0), firstTarget(0), lastTarget(0), visited(false)
{ } { }
virtual bool intersect(SiteMask* mask) { virtual bool intersect(SiteMask* mask, unsigned depth) {
if (depth > 0) {
// short-circuit recursion to avoid poor performance in
// deeply-nested branches
return reads != 0;
}
bool result = false; bool result = false;
if (not visited) { if (not visited) {
visited = true; visited = true;
for (Cell** cell = &reads; *cell;) { for (Cell** cell = &reads; *cell;) {
Read* r = static_cast<Read*>((*cell)->value); Read* r = static_cast<Read*>((*cell)->value);
bool valid = r->intersect(mask); bool valid = r->intersect(mask, depth + 1);
if (valid) { if (valid) {
result = true; result = true;
cell = &((*cell)->next); cell = &((*cell)->next);
@ -2101,11 +2107,11 @@ class StubRead: public Read {
next_(0), read(0), visited(false), valid_(true) next_(0), read(0), visited(false), valid_(true)
{ } { }
virtual bool intersect(SiteMask* mask) { virtual bool intersect(SiteMask* mask, unsigned depth) {
if (not visited) { if (not visited) {
visited = true; visited = true;
if (read) { if (read) {
bool valid = read->intersect(mask); bool valid = read->intersect(mask, depth);
if (not valid) { if (not valid) {
read = 0; read = 0;
} }
@ -4333,6 +4339,8 @@ resolveOriginalSites(Context* c, Event* e, SiteRecordList* frozen,
} else { } else {
complete = false; complete = false;
} }
} else {
sites[el.localIndex] = 0;
} }
} }