Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Ensures async-lighting safety

Browse Source
This commit is contained in:
Sotr
2018-06-23 16:30:58 +08:00
parent 343666756c
commit 7c6627edc8
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources/src/main/java/io/akarin/server/core/AkarinGlobalConfig.java
View File

@@ -185,16 +185,6 @@ public class AkarinGlobalConfig {
keepAliveTimeout = getSeconds(getString("core.keep-alive-response-timeout", "30s")) * 1000; keepAliveTimeout = getSeconds(getString("core.keep-alive-response-timeout", "30s")) * 1000;
} }
public static int asyncLightingThreads;
private static void asyncLightingThreads() {
asyncLightingThreads = getInt("core.async-lighting.executor-threads", 2);
}
public static boolean asyncLightingWorkStealing;
private static void asyncLightingWorkStealing() {
asyncLightingWorkStealing = getBoolean("core.async-lighting.use-work-stealing", false);
}
public static boolean throwOnAsyncCaught; public static boolean throwOnAsyncCaught;
private static void throwOnAsyncCaught() { private static void throwOnAsyncCaught() {
throwOnAsyncCaught = getBoolean("core.thread-safe.async-catcher.throw-on-caught", true); throwOnAsyncCaught = getBoolean("core.thread-safe.async-catcher.throw-on-caught", true);

2
sources/src/main/java/io/akarin/server/mixin/lighting/MixinChunk.java
View File

@@ -68,7 +68,7 @@ public abstract class MixinChunk implements IMixinChunk {
private CopyOnWriteArrayList<Short> queuedBlockLightingUpdates = new CopyOnWriteArrayList<>(); private CopyOnWriteArrayList<Short> queuedBlockLightingUpdates = new CopyOnWriteArrayList<>();
private AtomicInteger pendingLightUpdates = new AtomicInteger(); private AtomicInteger pendingLightUpdates = new AtomicInteger();
private long lightUpdateTime; private long lightUpdateTime;
private static ExecutorService lightExecutorService; private ExecutorService lightExecutorService;
@Shadow(aliases = "m") private boolean isGapLightingUpdated; @Shadow(aliases = "m") private boolean isGapLightingUpdated;
@Shadow(aliases = "r") private boolean ticked; @Shadow(aliases = "r") private boolean ticked;

11
sources/src/main/java/io/akarin/server/mixin/lighting/MixinWorldServer.java
View File

@@ -27,6 +27,8 @@ package io.akarin.server.mixin.lighting;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@@ -35,7 +37,6 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.akarin.api.internal.Akari; import io.akarin.api.internal.Akari;
import io.akarin.api.internal.mixin.IMixinChunk; import io.akarin.api.internal.mixin.IMixinChunk;
import io.akarin.api.internal.mixin.IMixinWorldServer; import io.akarin.api.internal.mixin.IMixinWorldServer;
import io.akarin.server.core.AkarinGlobalConfig;
import net.minecraft.server.BlockPosition; import net.minecraft.server.BlockPosition;
import net.minecraft.server.Chunk; import net.minecraft.server.Chunk;
import net.minecraft.server.EnumDirection; import net.minecraft.server.EnumDirection;
@@ -54,11 +55,11 @@ public abstract class MixinWorldServer extends MixinWorld implements IMixinWorld
private static final short XZ_MASK = 0xF; private static final short XZ_MASK = 0xF;
private static final short Y_SHORT_MASK = 0xFF; private static final short Y_SHORT_MASK = 0xFF;
private static final ExecutorService lightExecutorService = getExecutorService(); private final static ThreadFactory SERVICE_FACTORY = new ThreadFactoryBuilder().setNameFormat("Akarin Async Lighting Thread - %1$d").build();
private final ExecutorService lightExecutorService = getExecutorService();
private static ExecutorService getExecutorService() { private ExecutorService getExecutorService() {
return AkarinGlobalConfig.asyncLightingWorkStealing ? return Executors.newFixedThreadPool(1, SERVICE_FACTORY);
Executors.newFixedThreadPool(AkarinGlobalConfig.asyncLightingThreads, new ThreadFactoryBuilder().setNameFormat("Akarin Async Light Thread").build()) : Executors.newWorkStealingPool(AkarinGlobalConfig.asyncLightingThreads);
} }
@Override @Override