Alawn/Chronicle-Map
1
0
Fork 0
mirror of https://github.com/OpenHFT/Chronicle-Map.git synced 2021-09-13 01:26:12 +00:00
Code Releases Activity

Clean serializers and ThreadLocal fields of VanillaChronicleMap on close()

Browse Source
This commit is contained in:
leventov
2016-12-27 15:50:24 +08:00
parent fa70e216bd
commit 842064dca5
3 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/net/openhft/chronicle/map/MemoryLeaksTest.java
+5 -17
View File
@@ -23,7 +23,6 @@ import net.openhft.chronicle.core.OS;
import net.openhft.chronicle.core.values.IntValue;
import net.openhft.chronicle.hash.serialization.impl.StringSizedReader;
import net.openhft.chronicle.hash.serialization.impl.StringUtf8DataAccess;
import net.openhft.chronicle.map.impl.QueryContextInterface;
import net.openhft.chronicle.values.Values;
import org.junit.Assert;
import org.junit.Before;
@@ -151,21 +150,6 @@ public class MemoryLeaksTest {
}
assertEquals(nativeMemoryUsedBeforeMap, nativeMemoryUsed());
// Wait until chronicle map context (hence serializers) is collected by the GC
for (int i = 0; i < 6_000; i++) {
if (serializerCount.get() == serializersBeforeMap + 1)
break;
System.gc();
byte[] garbage = new byte[10_000_000];
Thread.sleep(10);
}
Assert.assertEquals(serializersBeforeMap + 1, serializerCount.get());
// This assertion ensures GC doesn't reclaim the map before or during the loop iteration
// above, to ensure that we test that the direct memory and contexts are released because
// of the manual map.close(), despite the "leak" of the map object itself.
Assert.assertEquals(0, map.offHeapMemoryUsed());
map = null;
// After cleaning the reference to the map, the last serializer, which was held in it's
// field, should be cleaned as well
for (int i = 0; i < 6_000; i++) {
if (serializerCount.get() == serializersBeforeMap)
break;
@@ -173,7 +157,11 @@ public class MemoryLeaksTest {
byte[] garbage = new byte[10_000_000];
Thread.sleep(10);
}
Assert.assertEquals(serializersBeforeMap, serializerCount.get());
Assert.assertTrue(serializerCount.get() == serializersBeforeMap);
// This assertion ensures GC doesn't reclaim the map before or during the loop iteration
// above, to ensure that we test that the direct memory and contexts are released because
// of the manual map.close(), despite the "leak" of the map object itself.
Assert.assertEquals(0, map.offHeapMemoryUsed());
}
private ChronicleMap<IntValue, String> getMap() throws IOException {