ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-22 12:28:11 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

return Tenured from MyHeap::status if the object resides in the immortal heap

Browse Source
This commit is contained in:
Joel Dice 2008-12-02 19:41:22 -07:00
parent 4098368cb9
commit 457c3d135e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/heap.cpp
View File

@ -203,7 +203,7 @@ class Segment {
return n; return n;
} }
static unsigned calculateSize(Context* c, unsigned capacity, static unsigned calculateSize(Context* c UNUSED, unsigned capacity,
unsigned scale, unsigned bitsPerRecord) unsigned scale, unsigned bitsPerRecord)
{ {
unsigned result unsigned result
@ -459,7 +459,7 @@ class Fixie {
} }
} }
void remove(Context* c) { void remove(Context* c UNUSED) {
if (handle) { if (handle) {
assert(c, *handle == this); assert(c, *handle == this);
*handle = next; *handle = next;
@ -884,6 +884,12 @@ copyTo(Context* c, Segment* s, void* o, unsigned size)
return dst; return dst;
} }
bool
immortalHeapContains(Context* c, void* p)
{
return p < c->immortalHeapEnd and p >= c->immortalHeapStart;
}
void* void*
copy2(Context* c, void* o) copy2(Context* c, void* o)
{ {
@ -920,6 +926,7 @@ copy2(Context* c, void* o)
} else { } else {
assert(c, not c->nextGen1.contains(o)); assert(c, not c->nextGen1.contains(o));
assert(c, not c->nextGen2.contains(o)); assert(c, not c->nextGen2.contains(o));
assert(c, not immortalHeapContains(c, o));
o = copyTo(c, &(c->nextGen1), o, size); o = copyTo(c, &(c->nextGen1), o, size);
@ -945,12 +952,6 @@ copy(Context* c, void* o)
return r; return r;
} }
bool
immortalHeapContains(Context* c, void* p)
{
return p < c->immortalHeapEnd and p >= c->immortalHeapStart;
}
void* void*
update3(Context* c, void* o, bool* needsVisit) update3(Context* c, void* o, bool* needsVisit)
{ {
@ -1832,6 +1833,7 @@ class MyHeap: public Heap {
} else if (c.nextGen1.contains(p)) { } else if (c.nextGen1.contains(p)) {
return Reachable; return Reachable;
} else if (c.nextGen2.contains(p) } else if (c.nextGen2.contains(p)
or immortalHeapContains(&c, p)
or (c.gen2.contains(p) or (c.gen2.contains(p)
and (c.mode == Heap::MinorCollection and (c.mode == Heap::MinorCollection
or c.gen2.indexOf(p) >= c.gen2Base))) or c.gen2.indexOf(p) >= c.gen2Base)))