From cb15a8dc8cee18a4d5b6a8ce3ccbbf28dfd0c65c Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 25 Jan 2014 14:08:35 +1100 Subject: [PATCH] Highly Optimized Tick Loop diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 588ce0a..a549a95 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -101,6 +101,11 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo public java.util.Queue processQueue = new java.util.concurrent.ConcurrentLinkedQueue(); public int autosavePeriod; // CraftBukkit end + // Spigot start + private static final int TPS = 20; + private static final int TICK_TIME = 1000000000 / TPS; + public final double[] recentTps = new double[ 3 ]; + // Spigot end public MinecraftServer(OptionSet options, Proxy proxy) { // CraftBukkit - signature file -> OptionSet i = this; @@ -419,6 +424,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo this.isRunning = false; } + // Spigot Start + private static double calcTps(double avg, double exp, double tps) + { + return ( avg * exp ) + ( tps * ( 1 - exp ) ); + } + // Spigot End + public void run() { try { if (this.init()) { @@ -429,38 +441,32 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo this.p.setServerInfo(new ServerPingServerData("1.7.2", 4)); this.a(this.p); + // Spigot start + long lastTick = 0, catchupTime = 0, curTime, wait; while (this.isRunning) { - long k = ap(); - long l = k - i; - - if (l > 2000L && i - this.O >= 15000L) { - if (this.server.getWarnOnOverload()) // CraftBukkit - Added option to suppress warning messages - h.warn("Can\'t keep up! Did the system time change, or is the server overloaded? Running {}ms behind, skipping {} tick(s)", new Object[] { Long.valueOf(l), Long.valueOf(l / 50L)}); - l = 2000L; - this.O = i; - } - - if (l < 0L) { - h.warn("Time ran backwards! Did the system time change?"); - l = 0L; + curTime = System.nanoTime(); + wait = TICK_TIME - (curTime - lastTick) - catchupTime; + if (wait > 0) { + Thread.sleep(wait / 1000000); + catchupTime = 0; + continue; + } else { + catchupTime = Math.min(1000000000, Math.abs(wait)); } - j += l; - i = k; - if (this.worlds.get(0).everyoneDeeplySleeping()) { // CraftBukkit - this.t(); - j = 0L; - } else { - while (j > 50L) { - MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit - j -= 50L; - this.t(); - } + if ( MinecraftServer.currentTick++ % 100 == 0 ) + { + double currentTps = 1E9 / ( curTime - lastTick ); + recentTps[0] = calcTps( recentTps[0], 0.92, currentTps ); // 1/exp(5sec/1min) + recentTps[1] = calcTps( recentTps[1], 0.9835, currentTps ); // 1/exp(5sec/5min) + recentTps[2] = calcTps( recentTps[2], 0.9945, currentTps ); // 1/exp(5sec/15min) } + lastTick = curTime; - Thread.sleep(1L); + this.t(); this.N = true; } + // Spigot end } else { this.a((CrashReport) null); } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java index 205249e..6634292 100755 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -248,4 +248,9 @@ public class SpigotConfig "screen." ); } } + + private static void tpsCommand() + { + commands.put( "tps", new TicksPerSecondCommand( "tps" ) ); + } } diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java new file mode 100644 index 0000000..36363ee --- /dev/null +++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java @@ -0,0 +1,44 @@ +package org.spigotmc; + +import com.google.common.base.Joiner; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.com.google.common.collect.Iterables; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; + +public class TicksPerSecondCommand extends Command +{ + + public TicksPerSecondCommand(String name) + { + super( name ); + this.description = "Gets the current ticks per second for the server"; + this.usageMessage = "/tps"; + this.setPermission( "bukkit.command.tps" ); + } + + @Override + public boolean execute(CommandSender sender, String currentAlias, String[] args) + { + if ( !testPermission( sender ) ) + { + return true; + } + + StringBuilder sb = new StringBuilder( ChatColor.GOLD + "TPS from last 1m, 5m, 15m: " ); + for ( double tps : MinecraftServer.getServer().recentTps ) + { + sb.append( format( Math.max( tps, 20.0 ) ) ); + sb.append( ", " ); + } + sender.sendMessage( sb.substring( 0, sb.length() - 2 ) ); + + return true; + } + + private String format(double tps) + { + return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString() + tps; + } +} -- 1.8.3.2