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

Fixes gc hang

Browse Source
This commit is contained in:
Sotr
2018-06-17 16:39:03 +08:00
parent 9fedd2d94e
commit f7792c2510
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sources/src/main/java/io/akarin/server/mixin/bootstrap/MixinRestartCommand.java Normal file
View File

@@ -0,0 +1,21 @@
package io.akarin.server.mixin.bootstrap;
import org.spigotmc.RestartCommand;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import io.akarin.api.internal.Akari;
import io.akarin.server.core.AkarinGlobalConfig;
@Mixin(value = RestartCommand.class, remap = false)
public abstract class MixinRestartCommand {
@Inject(method = "restart()V", at = @At("HEAD"))
public static void beforeRestart() {
if (AkarinGlobalConfig.noResponseDoGC) {
Akari.logger.warn("Attempting to garbage collect, may takes a few seconds");
System.runFinalization();
System.gc();
}
}
}

7
sources/src/main/java/io/akarin/server/mixin/bootstrap/Watchcat.java
View File

@@ -17,7 +17,6 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import io.akarin.server.core.AkarinGlobalConfig;
import net.minecraft.server.MinecraftServer;
@Mixin(value = WatchdogThread.class, remap = false)
@@ -75,11 +74,7 @@ public abstract class Watchcat extends Thread {
}
log.log(Level.SEVERE, "------------------------------");
if (AkarinGlobalConfig.noResponseDoGC) {
log.log(Level.SEVERE, "Attempting to garbage collect, may takes a few seconds");
System.gc();
}
if (restart) RestartCommand.restart();
if (restart) RestartCommand.restart(); // GC Inlined
break;
}