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

Accurate timings

Browse Source
This commit is contained in:
Sotr
2018-08-28 17:39:19 +08:00
parent 2f87a4c54e
commit 8e6000c523
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,6 +160,11 @@ public class AkarinGlobalConfig {
playersPerIOThread = getInt("core.players-per-chunk-io-thread", 50); playersPerIOThread = getInt("core.players-per-chunk-io-thread", 50);
} }
public static boolean silentAsyncTimings;
private static void silentAsyncTimings() {
silentAsyncTimings = getBoolean("core.always-silent-async-timing", false);
}
public static long timeUpdateInterval; public static long timeUpdateInterval;
private static void timeUpdateInterval() { private static void timeUpdateInterval() {
timeUpdateInterval = getSeconds(getString("core.tick-rate.world-time-update-interval", "1s")) * 10; timeUpdateInterval = getSeconds(getString("core.tick-rate.world-time-update-interval", "1s")) * 10;

29
sources/src/main/java/io/akarin/server/mixin/core/MixinTimingHandler.java
View File

@@ -9,8 +9,13 @@ import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import co.aikar.timings.Timing; import co.aikar.timings.Timing;
import io.akarin.api.internal.Akari; import io.akarin.api.internal.Akari;
import io.akarin.api.internal.Akari.AssignableThread;
import io.akarin.server.core.AkarinGlobalConfig; import io.akarin.server.core.AkarinGlobalConfig;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@@ -24,12 +29,18 @@ public abstract class MixinTimingHandler {
@Shadow abstract void addDiff(long diff); @Shadow abstract void addDiff(long diff);
@Shadow public abstract Timing startTiming(); @Shadow public abstract Timing startTiming();
@Overwrite @Overwrite // Overwrite to avoid twice thread check
public Timing startTimingIfSync() { public Timing startTimingIfSync() {
startTiming(); startTiming();
return (Timing) this; return (Timing) this;
} }
@SuppressWarnings({"rawtypes", "unchecked"})
@Inject(method = "startTiming", at = @At("HEAD"), cancellable = true)
public void onStartTiming(CallbackInfoReturnable ci) {
if (!Akari.isPrimaryThread(false)) ci.setReturnValue(this); // Avoid modify any field
}
@Overwrite @Overwrite
public void stopTimingIfSync() { public void stopTimingIfSync() {
if (Akari.isPrimaryThread(false)) { if (Akari.isPrimaryThread(false)) {
@@ -47,17 +58,21 @@ public abstract class MixinTimingHandler {
} }
public void stopTiming(boolean alreadySync) { public void stopTiming(boolean alreadySync) {
if (!enabled || --timingDepth != 0 || start == 0) return; if (!enabled) return;
if (!alreadySync) { if (!alreadySync) {
Thread curThread = Thread.currentThread(); Thread curThread = Thread.currentThread();
if (curThread.getClass() == AssignableThread.class) return;
if (curThread != MinecraftServer.getServer().primaryThread) { if (curThread != MinecraftServer.getServer().primaryThread) {
start = 0; if (AkarinGlobalConfig.silentAsyncTimings) return;
return; Bukkit.getLogger().log(Level.SEVERE, "stopTiming called async for " + name);
Thread.dumpStack();
} }
} }
// Safety ensured // Main thread ensured
addDiff(System.nanoTime() - start); if (--timingDepth == 0 && start != 0) {
start = 0; addDiff(System.nanoTime() - start);
start = 0;
}
} }
} }