ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

avoid allocating new memory in hashMapRemove when GCing

Browse Source 
This ensures that we don't abort when running an internal finalizer
that removes from a hash map.
This commit is contained in:
Joel Dice 2013-04-22 21:17:31 -06:00
parent 68c3b241ce
commit e0ceaa5f43
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/util.cpp
View File

@ -449,6 +449,12 @@ hashMapInsert(Thread* t, object map, object key, object value,
set(t, n, TripleThird, arrayBody(t, array, index)); set(t, n, TripleThird, arrayBody(t, array, index));
set(t, array, ArrayBody + (index * BytesPerWord), n); set(t, array, ArrayBody + (index * BytesPerWord), n);
if (hashMapSize(t, map) <= arrayLength(t, array) / 3) {
// this might happen if nodes were removed during GC in which case
// we weren't able to resize at the time
hashMapResize(t, map, hash, arrayLength(t, array) / 2);
}
} }
object object
@ -495,7 +501,9 @@ hashMapRemove(Thread* t, object map, object key,
} }
} }
if (hashMapSize(t, map) <= arrayLength(t, array) / 3) { if ((not t->m->collecting)
and hashMapSize(t, map) <= arrayLength(t, array) / 3)
{
PROTECT(t, o); PROTECT(t, o);
hashMapResize(t, map, hash, arrayLength(t, array) / 2); hashMapResize(t, map, hash, arrayLength(t, array) / 2);
} }