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

Give more conservative head room for avoid Map's with an imperfect hash distribution filling up.

Browse Source
This commit is contained in:
Peter Lawrey
2014-10-17 09:12:25 +01:00
parent d01b5d8c59
commit adfec1b613
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+6 -1
View File
@@ -385,8 +385,13 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
if (actualEntriesPerSegment > 0)
return actualEntriesPerSegment;
int as = actualSegments();
long actualEntries =
as == 1 ? entries + 1 : // The extra 1 might not be needed.
as <= 4 ? entries * 10L / 9 : // 10%, assumes you are trying to be tight.
entries * 5L / 4; // 25%
// round up to the next multiple of 64.
return (int) (Math.max(1, entries * 2L / as) + 63) & ~63;
return (int) (Math.max(1, actualEntries / as) + 63) & ~63;
}
@Override
src/main/java/net/openhft/chronicle/map/serialization/CopyingMetaBytesInterop.java
+4 -4
View File
@@ -16,14 +16,14 @@
package net.openhft.chronicle.map.serialization;
import net.openhft.chronicle.map.threadlocal.Provider;
import net.openhft.chronicle.map.threadlocal.StatefulCopyable;
import net.openhft.chronicle.map.threadlocal.ThreadLocalCopies;
import net.openhft.lang.io.Bytes;
import net.openhft.lang.io.DirectBytes;
import net.openhft.lang.io.DirectStore;
import net.openhft.lang.io.serialization.BytesMarshaller;
import net.openhft.lang.io.serialization.JDKObjectSerializer;
import net.openhft.chronicle.map.threadlocal.Provider;
import net.openhft.chronicle.map.threadlocal.StatefulCopyable;
import net.openhft.chronicle.map.threadlocal.ThreadLocalCopies;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -190,7 +190,7 @@ public abstract class CopyingMetaBytesInterop<E, W> implements MetaBytesInterop<
forBytesWriter = new ForBytesWriter();
}
private Bytes obtain(long maxSize) {
Bytes obtain(long maxSize) {
DirectBytes buf;
if ((buf = buffer) != null) {
if (maxSize <= buf.capacity()) {
src/test/java/net/openhft/chronicle/map/OSResizesMain.java
+6 -3
View File
@@ -34,9 +34,8 @@ public class OSResizesMain {
public static void main(String[] args) throws IOException, InterruptedException {
File file = File.createTempFile("over-sized", "deleteme");
ChronicleMap<String, String> map = ChronicleMapBuilder.of(String.class, String.class)
.entrySize(1024 * 1024)
.entries(1024 * 1024)
.entrySize(100 * 1024 * 1024)
.entries(1000000)
.create(file);
for (int i = 0; i < 10000; i++) {
char[] chars = new char[i];
@@ -48,6 +47,10 @@ public class OSResizesMain {
file.length() / 1e9,
run("du", "-h", file.getAbsolutePath()).split("\\s")[0],
run("grep", "over-sized", "/proc/" + Jvm.getProcessId() + "/maps").split("\\s")[0]);
// show up in top.
long time = System.currentTimeMillis();
while (time + 20000 > System.currentTimeMillis())
Thread.yield();
map.close();
file.delete();
}