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

Re-add thread configurations for async lighting w/ Removed craps

Browse Source
This commit is contained in:
Sotr
2018-07-23 18:33:30 +08:00
parent f77f039dbb
commit 87583d4e7c
6 changed files with 22 additions and 14 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,6 +185,16 @@ public class AkarinGlobalConfig {
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;
private static void throwOnAsyncCaught() {
throwOnAsyncCaught = getBoolean("core.thread-safe.async-catcher.throw-on-caught", true);

8
sources/src/main/java/io/akarin/server/core/AkarinSlackScheduler.java
View File

@@ -18,10 +18,10 @@ public class AkarinSlackScheduler extends Thread {
return Singleton.instance;
}
public static void boot() {
Singleton.instance.setName("Akarin Slack Scheduler Thread");
Singleton.instance.setDaemon(true);
Singleton.instance.start();
public void boot() {
setName("Akarin Slack Scheduler Thread");
setDaemon(true);
start();
Akari.logger.info("Slack scheduler service started");
}

2
sources/src/main/java/io/akarin/server/mixin/core/MixinAsyncCatcher.java
View File

@@ -7,7 +7,6 @@ import org.spongepowered.asm.mixin.Shadow;
import io.akarin.api.internal.Akari;
import io.akarin.server.core.AkarinGlobalConfig;
import net.minecraft.server.PersistentCollection;
@Mixin(value = AsyncCatcher.class, remap = false)
public abstract class MixinAsyncCatcher {
@@ -23,7 +22,6 @@ public abstract class MixinAsyncCatcher {
} else {
Akari.logger.warn("Asynchronous " + reason + "!");
Thread.dumpStack();
PersistentCollection.class.getName();
}
}
}

2
sources/src/main/java/io/akarin/server/mixin/core/MixinMinecraftServer.java
View File

@@ -59,7 +59,7 @@ public abstract class MixinMinecraftServer {
WorldServer world = worlds.get(i);
TileEntityHopper.skipHopperEvents = world.paperConfig.disableHopperMoveEvents || InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0;
}
AkarinSlackScheduler.boot();
AkarinSlackScheduler.get().boot();
}
@Overwrite

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 AtomicInteger pendingLightUpdates = new AtomicInteger();
private long lightUpdateTime;
private ExecutorService lightExecutorService;
private static ExecutorService lightExecutorService;
@Shadow(aliases = "m") private boolean isGapLightingUpdated;
@Shadow(aliases = "r") private boolean ticked;

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

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