ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

reset immortal fixed objects when heap is disposed

Browse Source 
This should ensure that the bootimage is ready to reuse by another
instance of the VM later on.
This commit is contained in:
Joel Dice 2011-11-11 17:37:40 -07:00
parent 7d185dd27d
commit 3e5a7d9a41
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/heap.cpp
View File

@ -560,7 +560,7 @@ fixie(void* body)
}
void
free(Context* c, Fixie** fixies);
free(Context* c, Fixie** fixies, bool resetImmortal = false);
class Context {
public:
@ -630,9 +630,9 @@ class Context {
}
void disposeFixies() {
free(this, &tenuredFixies);
free(this, &dirtyTenuredFixies);
free(this, &fixies);
free(this, &tenuredFixies, true);
free(this, &dirtyTenuredFixies, true);
free(this, &fixies, true);
}
System* system;
@ -846,13 +846,25 @@ bitset(Context* c UNUSED, void* o)
}
void
free(Context* c, Fixie** fixies)
free(Context* c, Fixie** fixies, bool resetImmortal)
{
for (Fixie** p = fixies; *p;) {
Fixie* f = *p;
if (f->immortal()) {
p = &(f->next);
if (resetImmortal) {
if (DebugFixies) {
fprintf(stderr, "reset immortal fixie %p\n", f);
}
*p = f->next;
memset(f->mask(), 0, Fixie::maskSize(f->size, f->hasMask));
f->next = 0;
f->handle = 0;
f->marked = false;
f->dirty = false;
} else {
p = &(f->next);
}
} else {
*p = f->next;
if (DebugFixies) {