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

rearrange finalization code in collect to avoid inifinite recursion when finalizer allocates memory

Browse Source
This commit is contained in:
Joel Dice 2009-07-17 09:29:24 -06:00
parent 9c9eb86b2f
commit 3e4336eba4
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/machine.cpp
View File

@ -2762,13 +2762,6 @@ collect(Thread* t, Heap::CollectionType type)
postCollect(m->rootThread); postCollect(m->rootThread);
for (object f = m->finalizeQueue; f; f = finalizerNext(t, f)) {
void (*function)(Thread*, object);
memcpy(&function, &finalizerFinalize(t, f), BytesPerWord);
function(t, finalizerTarget(t, f));
}
m->finalizeQueue = 0;
killZombies(t, m->rootThread); killZombies(t, m->rootThread);
for (unsigned i = 0; i < m->heapPoolIndex; ++i) { for (unsigned i = 0; i < m->heapPoolIndex; ++i) {
@ -2781,6 +2774,14 @@ collect(Thread* t, Heap::CollectionType type)
#ifdef VM_STRESS #ifdef VM_STRESS
if (not stress) t->stress = false; if (not stress) t->stress = false;
#endif #endif
object f = m->finalizeQueue;
m->finalizeQueue = 0;
for (; f; f = finalizerNext(t, f)) {
void (*function)(Thread*, object);
memcpy(&function, &finalizerFinalize(t, f), BytesPerWord);
function(t, finalizerTarget(t, f));
}
} }
void void