subprocess spawner (#542)

This commit is contained in:
Artsiom Korzun 2024-01-21 20:23:48 +01:00 committed by GitHub
parent d8b071c878
commit ac4805ee45
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 76 additions and 45 deletions

View File

@ -17,9 +17,9 @@
if [ -f target/CalculateAverage_artsiomkorzun_image ]; then if [ -f target/CalculateAverage_artsiomkorzun_image ]; then
echo "Picking up existing native image 'target/CalculateAverage_artsiomkorzun_image', delete the file to select JVM mode." 1>&2 echo "Picking up existing native image 'target/CalculateAverage_artsiomkorzun_image', delete the file to select JVM mode." 1>&2
target/CalculateAverage_artsiomkorzun_image -XX:MaxDirectMemorySize=4294967296 target/CalculateAverage_artsiomkorzun_image
else else
JAVA_OPTS="--enable-preview -Xmx128m -XX:+UseSerialGC -XX:-TieredCompilation -XX:MaxDirectMemorySize=4294967296" JAVA_OPTS="--enable-preview -Xmx128m -XX:+UseSerialGC -XX:-TieredCompilation"
echo "Chosing to run the app in JVM mode as no native image was found, use prepare_artsiomkorzun.sh to generate." 1>&2 echo "Chosing to run the app in JVM mode as no native image was found, use prepare_artsiomkorzun.sh to generate." 1>&2
java $JAVA_OPTS --class-path target/average-1.0.0-SNAPSHOT.jar dev.morling.onebrc.CalculateAverage_artsiomkorzun java $JAVA_OPTS --class-path target/average-1.0.0-SNAPSHOT.jar dev.morling.onebrc.CalculateAverage_artsiomkorzun
fi fi

View File

@ -16,7 +16,7 @@
# #
source "$HOME/.sdkman/bin/sdkman-init.sh" source "$HOME/.sdkman/bin/sdkman-init.sh"
sdk use java 21.0.1-graal 1>&2 sdk use java 21.0.2-graal 1>&2
if [ ! -f target/CalculateAverage_artsiomkorzun_image ]; then if [ ! -f target/CalculateAverage_artsiomkorzun_image ]; then
NATIVE_IMAGE_OPTS="--gc=epsilon -O3 -march=native -R:MaxHeapSize=64m --enable-preview --initialize-at-build-time=dev.morling.onebrc.CalculateAverage_artsiomkorzun" NATIVE_IMAGE_OPTS="--gc=epsilon -O3 -march=native -R:MaxHeapSize=64m --enable-preview --initialize-at-build-time=dev.morling.onebrc.CalculateAverage_artsiomkorzun"

View File

@ -17,12 +17,14 @@ package dev.morling.onebrc;
import sun.misc.Unsafe; import sun.misc.Unsafe;
import java.lang.foreign.Arena;
import java.lang.foreign.MemorySegment;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel; import java.nio.channels.FileChannel;
import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@ -31,21 +33,19 @@ import java.util.concurrent.atomic.AtomicReference;
public class CalculateAverage_artsiomkorzun { public class CalculateAverage_artsiomkorzun {
private static final Path FILE = Path.of("./measurements.txt"); private static final Path FILE = Path.of("./measurements.txt");
private static final int SEGMENT_SIZE = 4 * 1024 * 1024; private static final long SEGMENT_SIZE = 4 * 1024 * 1024;
private static final int SEGMENT_OVERLAP = 128; private static final long SEGMENT_OVERLAP = 128;
private static final long COMMA_PATTERN = 0x3B3B3B3B3B3B3B3BL; private static final long COMMA_PATTERN = 0x3B3B3B3B3B3B3B3BL;
private static final long DOT_BITS = 0x10101000; private static final long DOT_BITS = 0x10101000;
private static final long MAGIC_MULTIPLIER = (100 * 0x1000000 + 10 * 0x10000 + 1); private static final long MAGIC_MULTIPLIER = (100 * 0x1000000 + 10 * 0x10000 + 1);
private static final Unsafe UNSAFE; private static final Unsafe UNSAFE;
private static final long ADDRESS_OFFSET;
static { static {
try { try {
Field unsafe = Unsafe.class.getDeclaredField("theUnsafe"); Field unsafe = Unsafe.class.getDeclaredField("theUnsafe");
unsafe.setAccessible(true); unsafe.setAccessible(true);
UNSAFE = (Unsafe) unsafe.get(Unsafe.class); UNSAFE = (Unsafe) unsafe.get(Unsafe.class);
ADDRESS_OFFSET = UNSAFE.objectFieldOffset(Buffer.class.getDeclaredField("address"));
} }
catch (Throwable e) { catch (Throwable e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@ -60,11 +60,42 @@ public class CalculateAverage_artsiomkorzun {
// System.err.println("Time: " + (end - start)); // System.err.println("Time: " + (end - start));
// } // }
if (isSpawn(args)) {
spawn();
return;
}
execute(); execute();
} }
private static boolean isSpawn(String[] args) {
for (String arg : args) {
if ("--worker".equals(arg)) {
return false;
}
}
return true;
}
private static void spawn() throws Exception {
ProcessHandle.Info info = ProcessHandle.current().info();
ArrayList<String> commands = new ArrayList<>();
info.command().ifPresent(commands::add);
info.arguments().ifPresent(args -> commands.addAll(Arrays.asList(args)));
commands.add("--worker");
new ProcessBuilder()
.command(commands)
.start()
.getInputStream()
.transferTo(System.out);
}
private static void execute() throws Exception { private static void execute() throws Exception {
long fileSize = Files.size(FILE); MemorySegment fileMemory = map(FILE);
long fileAddress = fileMemory.address();
long fileSize = fileMemory.byteSize();
int segmentCount = (int) ((fileSize + SEGMENT_SIZE - 1) / SEGMENT_SIZE); int segmentCount = (int) ((fileSize + SEGMENT_SIZE - 1) / SEGMENT_SIZE);
AtomicInteger counter = new AtomicInteger(); AtomicInteger counter = new AtomicInteger();
@ -74,7 +105,7 @@ public class CalculateAverage_artsiomkorzun {
Aggregator[] aggregators = new Aggregator[parallelism]; Aggregator[] aggregators = new Aggregator[parallelism];
for (int i = 0; i < aggregators.length; i++) { for (int i = 0; i < aggregators.length; i++) {
aggregators[i] = new Aggregator(counter, result, segmentCount); aggregators[i] = new Aggregator(counter, result, fileAddress, fileSize, segmentCount);
aggregators[i].start(); aggregators[i].start();
} }
@ -84,18 +115,17 @@ public class CalculateAverage_artsiomkorzun {
Map<String, Aggregate> aggregates = result.get().aggregate(); Map<String, Aggregate> aggregates = result.get().aggregate();
System.out.println(text(aggregates)); System.out.println(text(aggregates));
System.out.close();
} }
private static long address(ByteBuffer buffer) { private static MemorySegment map(Path file) {
return UNSAFE.getLong(buffer, ADDRESS_OFFSET); try (FileChannel channel = FileChannel.open(file, StandardOpenOption.READ)) {
} long size = channel.size();
return channel.map(FileChannel.MapMode.READ_ONLY, 0, size, Arena.global());
private static ByteBuffer allocate(int size) { }
ByteBuffer buffer = ByteBuffer.allocateDirect(size + 4096); catch (Throwable e) {
long address = address(buffer); throw new RuntimeException(e);
long aligned = (address + 4095) & (~4095); }
int padding = (int) (aligned - address);
return buffer.position(padding).limit(padding + size).slice();
} }
private static long word(long address) { private static long word(long address) {
@ -142,8 +172,13 @@ public class CalculateAverage_artsiomkorzun {
private static final int SIZE = 128 * ENTRIES; private static final int SIZE = 128 * ENTRIES;
private static final int MASK = (ENTRIES - 1) << 7; private static final int MASK = (ENTRIES - 1) << 7;
private final ByteBuffer buffer = allocate(SIZE); private final long pointer;
private final long pointer = address(buffer);
public Aggregates() {
long address = UNSAFE.allocateMemory(SIZE + 4096);
pointer = (address + 4095) & (~4095);
UNSAFE.setMemory(pointer, SIZE, (byte) 0);
}
public long find(long word, int hash) { public long find(long word, int hash) {
long address = pointer + offset(hash); long address = pointer + offset(hash);
@ -308,39 +343,35 @@ public class CalculateAverage_artsiomkorzun {
private final AtomicInteger counter; private final AtomicInteger counter;
private final AtomicReference<Aggregates> result; private final AtomicReference<Aggregates> result;
private final int segments; private final long fileAddress;
private final long fileSize;
private final int segmentCount;
public Aggregator(AtomicInteger counter, AtomicReference<Aggregates> result, int segments) { public Aggregator(AtomicInteger counter, AtomicReference<Aggregates> result,
long fileAddress, long fileSize, int segmentCount) {
super("aggregator"); super("aggregator");
this.counter = counter; this.counter = counter;
this.result = result; this.result = result;
this.segments = segments; this.fileAddress = fileAddress;
this.fileSize = fileSize;
this.segmentCount = segmentCount;
} }
@Override @Override
public void run() { public void run() {
Aggregates aggregates = new Aggregates(); Aggregates aggregates = new Aggregates();
ByteBuffer buffer = allocate(SEGMENT_SIZE + SEGMENT_OVERLAP);
try (FileChannel channel = FileChannel.open(FILE)) { for (int segment; (segment = counter.getAndIncrement()) < segmentCount;) {
for (int segment; (segment = counter.getAndIncrement()) < segments;) { long position = SEGMENT_SIZE * segment;
buffer.clear(); long size = Math.min(SEGMENT_SIZE + SEGMENT_OVERLAP, fileSize - position);
long address = fileAddress + position;
long limit = address + Math.min(SEGMENT_SIZE, size - 1);
long position = (long) SEGMENT_SIZE * segment; if (segment > 0) {
int size = channel.read(buffer, position); address = next(address);
long address = address(buffer);
long limit = address + Math.min(SEGMENT_SIZE, size - 1);
if (segment > 0) {
address = next(address);
}
aggregate(aggregates, address, limit);
} }
}
catch (Throwable e) { aggregate(aggregates, address, limit);
throw new RuntimeException(e);
} }
while (!result.compareAndSet(null, aggregates)) { while (!result.compareAndSet(null, aggregates)) {