2019-04-23 04:47:07 +00:00
|
|
|
From 253aab4a0dbe60736581c7036f6dc994f02d49a3 Mon Sep 17 00:00:00 2001
|
2015-01-29 21:25:50 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
2016-02-29 23:09:49 +00:00
|
|
|
Date: Tue, 1 Mar 2016 23:09:29 -0600
|
2014-10-19 22:58:49 +00:00
|
|
|
Subject: [PATCH] Further improve server tick loop
|
|
|
|
|
|
|
|
Improves how the catchup buffer is handled, allowing it to roll both ways
|
|
|
|
increasing the effeciency of the thread sleep so it only will sleep once.
|
|
|
|
|
|
|
|
Also increases the buffer of the catchup to ensure server stays at 20 TPS unless extreme conditions
|
|
|
|
|
|
|
|
Previous implementation did not calculate TPS correctly.
|
|
|
|
Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2019-04-23 04:47:07 +00:00
|
|
|
index df85f35f37..7ca7b9f3ac 100644
|
2014-10-19 22:58:49 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2019-01-01 03:15:55 +00:00
|
|
|
@@ -141,7 +141,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
2014-10-19 22:58:49 +00:00
|
|
|
public org.bukkit.command.ConsoleCommandSender console;
|
|
|
|
public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
|
|
|
|
public ConsoleReader reader;
|
|
|
|
- public static int currentTick = (int) (System.currentTimeMillis() / 50);
|
2016-02-29 23:09:49 +00:00
|
|
|
+ public static int currentTick = 0; // Paper - Further improve tick loop
|
2014-10-19 22:58:49 +00:00
|
|
|
public final Thread primaryThread;
|
|
|
|
public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
|
|
|
|
public int autosavePeriod;
|
2019-01-01 03:15:55 +00:00
|
|
|
@@ -151,7 +151,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
2017-01-31 04:33:54 +00:00
|
|
|
// Spigot start
|
2018-08-26 18:11:49 +00:00
|
|
|
public static final int TPS = 20;
|
|
|
|
public static final int TICK_TIME = 1000000000 / TPS;
|
2014-10-19 22:58:49 +00:00
|
|
|
- private static final int SAMPLE_INTERVAL = 100;
|
2018-08-26 18:11:49 +00:00
|
|
|
+ private static final int SAMPLE_INTERVAL = 20; // Paper
|
|
|
|
public final double[] recentTps = new double[ 3 ];
|
2017-01-31 04:33:54 +00:00
|
|
|
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
|
|
|
|
// Spigot end
|
2019-01-06 17:15:21 +00:00
|
|
|
@@ -685,7 +685,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
2018-08-26 18:11:49 +00:00
|
|
|
}
|
2014-10-19 22:58:49 +00:00
|
|
|
|
2018-12-17 05:18:06 +00:00
|
|
|
private boolean canSleepForTick() {
|
|
|
|
- return SystemUtils.getMonotonicMillis() < this.nextTick;
|
2018-08-26 18:11:49 +00:00
|
|
|
+ return System.nanoTime() - lastTick + catchupTime < TICK_TIME; // Paper - improved "are we lagging" check to match our own
|
2014-10-19 22:58:49 +00:00
|
|
|
}
|
|
|
|
|
2018-08-26 18:11:49 +00:00
|
|
|
// Spigot Start
|
2019-01-06 17:15:21 +00:00
|
|
|
@@ -693,6 +693,57 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
2018-08-26 18:11:49 +00:00
|
|
|
{
|
|
|
|
return ( avg * exp ) + ( tps * ( 1 - exp ) );
|
|
|
|
}
|
|
|
|
+
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper start - Further improve server tick loop
|
2014-10-19 22:58:49 +00:00
|
|
|
+ private static final long SEC_IN_NANO = 1000000000;
|
|
|
|
+ private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
|
2018-08-26 18:11:49 +00:00
|
|
|
+ private long lastTick = 0;
|
|
|
|
+ private long catchupTime = 0;
|
2014-10-19 22:58:49 +00:00
|
|
|
+ public final RollingAverage tps1 = new RollingAverage(60);
|
2014-11-28 01:17:45 +00:00
|
|
|
+ public final RollingAverage tps5 = new RollingAverage(60 * 5);
|
|
|
|
+ public final RollingAverage tps15 = new RollingAverage(60 * 15);
|
2014-10-19 22:58:49 +00:00
|
|
|
+
|
|
|
|
+ public static class RollingAverage {
|
|
|
|
+ private final int size;
|
|
|
|
+ private long time;
|
2018-09-18 02:32:37 +00:00
|
|
|
+ private java.math.BigDecimal total;
|
2014-10-19 22:58:49 +00:00
|
|
|
+ private int index = 0;
|
2018-09-18 02:32:37 +00:00
|
|
|
+ private final java.math.BigDecimal[] samples;
|
2014-10-19 22:58:49 +00:00
|
|
|
+ private final long[] times;
|
|
|
|
+
|
|
|
|
+ RollingAverage(int size) {
|
|
|
|
+ this.size = size;
|
|
|
|
+ this.time = size * SEC_IN_NANO;
|
2018-09-18 02:32:37 +00:00
|
|
|
+ this.total = dec(TPS).multiply(dec(SEC_IN_NANO)).multiply(dec(size));
|
|
|
|
+ this.samples = new java.math.BigDecimal[size];
|
2014-10-19 22:58:49 +00:00
|
|
|
+ this.times = new long[size];
|
|
|
|
+ for (int i = 0; i < size; i++) {
|
2018-09-18 02:32:37 +00:00
|
|
|
+ this.samples[i] = dec(TPS);
|
2014-10-19 22:58:49 +00:00
|
|
|
+ this.times[i] = SEC_IN_NANO;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
2018-09-18 02:32:37 +00:00
|
|
|
+ private static java.math.BigDecimal dec(long t) {
|
|
|
|
+ return new java.math.BigDecimal(t);
|
|
|
|
+ }
|
|
|
|
+ public void add(java.math.BigDecimal x, long t) {
|
2014-10-19 22:58:49 +00:00
|
|
|
+ time -= times[index];
|
2018-09-18 02:32:37 +00:00
|
|
|
+ total = total.subtract(samples[index].multiply(dec(times[index])));
|
2014-10-19 22:58:49 +00:00
|
|
|
+ samples[index] = x;
|
|
|
|
+ times[index] = t;
|
|
|
|
+ time += t;
|
2018-09-18 02:32:37 +00:00
|
|
|
+ total = total.add(x.multiply(dec(t)));
|
2014-10-19 22:58:49 +00:00
|
|
|
+ if (++index == size) {
|
|
|
|
+ index = 0;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public double getAverage() {
|
2018-09-18 02:32:37 +00:00
|
|
|
+ return total.divide(dec(time), 30, java.math.RoundingMode.HALF_UP).doubleValue();
|
2014-10-19 22:58:49 +00:00
|
|
|
+ }
|
2018-08-26 18:11:49 +00:00
|
|
|
+ }
|
2018-09-18 02:32:37 +00:00
|
|
|
+ private static final java.math.BigDecimal TPS_BASE = new java.math.BigDecimal(1E9).multiply(new java.math.BigDecimal(SAMPLE_INTERVAL));
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper End
|
2018-08-26 18:11:49 +00:00
|
|
|
// Spigot End
|
2017-01-31 04:33:54 +00:00
|
|
|
|
2014-10-19 22:58:49 +00:00
|
|
|
public void run() {
|
2019-01-06 17:15:21 +00:00
|
|
|
@@ -705,29 +756,47 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
|
2014-10-19 22:58:49 +00:00
|
|
|
|
|
|
|
// Spigot start
|
2015-07-26 20:58:37 +00:00
|
|
|
Arrays.fill( recentTps, 20 );
|
2018-08-09 13:02:05 +00:00
|
|
|
- long lastTick = System.nanoTime(), catchupTime = 0, curTime, wait, tickSection = lastTick, tickCount = 1;
|
2018-08-26 18:11:49 +00:00
|
|
|
+ long start = System.nanoTime(), curTime, wait, tickSection = start; // Paper - Further improve server tick loop
|
|
|
|
+ lastTick = start - TICK_TIME; // Paper
|
2014-10-19 22:58:49 +00:00
|
|
|
while (this.isRunning) {
|
|
|
|
curTime = System.nanoTime();
|
|
|
|
- wait = TICK_TIME - (curTime - lastTick) - catchupTime;
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper start - Further improve server tick loop
|
2014-10-19 22:58:49 +00:00
|
|
|
+ wait = TICK_TIME - (curTime - lastTick);
|
|
|
|
+ if (wait > 0) {
|
|
|
|
+ if (catchupTime < 2E6) {
|
|
|
|
+ wait += Math.abs(catchupTime);
|
2017-03-10 08:01:46 +00:00
|
|
|
+ } else if (wait < catchupTime) {
|
2014-10-19 22:58:49 +00:00
|
|
|
+ catchupTime -= wait;
|
|
|
|
+ wait = 0;
|
2017-03-10 08:01:46 +00:00
|
|
|
+ } else {
|
2014-10-19 22:58:49 +00:00
|
|
|
+ wait -= catchupTime;
|
2017-03-10 08:01:46 +00:00
|
|
|
+ catchupTime = 0;
|
2014-10-19 22:58:49 +00:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
if (wait > 0) {
|
|
|
|
Thread.sleep(wait / 1000000);
|
|
|
|
- catchupTime = 0;
|
|
|
|
- continue;
|
|
|
|
- } else {
|
|
|
|
- catchupTime = Math.min(1000000000, Math.abs(wait));
|
2017-03-10 08:01:46 +00:00
|
|
|
+ curTime = System.nanoTime();
|
2014-10-19 22:58:49 +00:00
|
|
|
+ wait = TICK_TIME - (curTime - lastTick);
|
|
|
|
}
|
|
|
|
|
2018-08-09 13:02:05 +00:00
|
|
|
- if ( tickCount++ % SAMPLE_INTERVAL == 0 )
|
2014-10-19 22:58:49 +00:00
|
|
|
+ catchupTime = Math.min(MAX_CATCHUP_BUFFER, catchupTime - wait);
|
2014-11-28 01:17:45 +00:00
|
|
|
+ if ( ++MinecraftServer.currentTick % SAMPLE_INTERVAL == 0 )
|
2014-10-19 22:58:49 +00:00
|
|
|
{
|
|
|
|
- double currentTps = 1E9 / ( curTime - tickSection ) * SAMPLE_INTERVAL;
|
|
|
|
- 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)
|
|
|
|
+ final long diff = curTime - tickSection;
|
2018-09-18 02:32:37 +00:00
|
|
|
+ java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
|
2014-10-19 22:58:49 +00:00
|
|
|
+ tps1.add(currentTps, diff);
|
|
|
|
+ tps5.add(currentTps, diff);
|
|
|
|
+ tps15.add(currentTps, diff);
|
2015-07-26 20:58:37 +00:00
|
|
|
+ // Backwards compat with bad plugins
|
|
|
|
+ recentTps[0] = tps1.getAverage();
|
|
|
|
+ recentTps[1] = tps5.getAverage();
|
|
|
|
+ recentTps[2] = tps15.getAverage();
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper end
|
2014-10-19 22:58:49 +00:00
|
|
|
tickSection = curTime;
|
|
|
|
}
|
|
|
|
lastTick = curTime;
|
2018-08-10 14:25:45 +00:00
|
|
|
|
|
|
|
- MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit
|
|
|
|
+ //MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit // Paper - don't overwrite current tick time
|
2018-12-17 05:18:06 +00:00
|
|
|
this.a(this::canSleepForTick);
|
|
|
|
this.nextTick += 50L;
|
2018-08-10 14:25:45 +00:00
|
|
|
// Spigot end
|
2014-10-19 22:58:49 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2019-04-23 04:47:07 +00:00
|
|
|
index 351313d98c..7b4af7a904 100644
|
2014-10-19 22:58:49 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2019-04-08 10:51:36 +00:00
|
|
|
@@ -1983,6 +1983,17 @@ public final class CraftServer implements Server {
|
2016-02-29 23:09:49 +00:00
|
|
|
return CraftMagicNumbers.INSTANCE;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper - Add getTPS API - Further improve tick loop
|
|
|
|
+ @Override
|
|
|
|
+ public double[] getTPS() {
|
|
|
|
+ return new double[] {
|
|
|
|
+ MinecraftServer.getServer().tps1.getAverage(),
|
|
|
|
+ MinecraftServer.getServer().tps5.getAverage(),
|
|
|
|
+ MinecraftServer.getServer().tps15.getAverage()
|
|
|
|
+ };
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
2014-11-28 01:17:45 +00:00
|
|
|
private final Spigot spigot = new Spigot()
|
|
|
|
{
|
2014-10-19 22:58:49 +00:00
|
|
|
|
|
|
|
diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
|
2019-04-23 04:47:07 +00:00
|
|
|
index be2e31deae..6d21c32692 100644
|
2014-10-19 22:58:49 +00:00
|
|
|
--- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
|
|
|
|
+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
|
2014-11-28 01:17:45 +00:00
|
|
|
@@ -1,8 +1,5 @@
|
2014-10-19 22:58:49 +00:00
|
|
|
package org.spigotmc;
|
|
|
|
|
|
|
|
-import com.google.common.base.Joiner;
|
|
|
|
-import net.minecraft.server.MinecraftServer;
|
2014-11-28 01:17:45 +00:00
|
|
|
-import com.google.common.collect.Iterables;
|
2014-10-19 22:58:49 +00:00
|
|
|
import org.bukkit.ChatColor;
|
|
|
|
import org.bukkit.command.Command;
|
|
|
|
import org.bukkit.command.CommandSender;
|
2016-02-29 23:09:49 +00:00
|
|
|
@@ -26,18 +23,20 @@ public class TicksPerSecondCommand extends Command
|
2014-10-19 22:58:49 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
- StringBuilder sb = new StringBuilder( ChatColor.GOLD + "TPS from last 1m, 5m, 15m: " );
|
|
|
|
- for ( double tps : MinecraftServer.getServer().recentTps )
|
|
|
|
- {
|
|
|
|
- sb.append( format( tps ) );
|
|
|
|
- sb.append( ", " );
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper start - Further improve tick handling
|
|
|
|
+ double[] tps = org.bukkit.Bukkit.getTPS();
|
2014-10-19 22:58:49 +00:00
|
|
|
+ String[] tpsAvg = new String[tps.length];
|
|
|
|
+
|
2016-02-29 23:09:49 +00:00
|
|
|
+ for ( int i = 0; i < tps.length; i++) {
|
|
|
|
+ tpsAvg[i] = format( tps[i] );
|
2014-10-19 22:58:49 +00:00
|
|
|
}
|
|
|
|
- sender.sendMessage( sb.substring( 0, sb.length() - 2 ) );
|
2014-11-28 01:17:45 +00:00
|
|
|
+ sender.sendMessage( ChatColor.GOLD + "TPS from last 1m, 5m, 15m: " + org.apache.commons.lang.StringUtils.join(tpsAvg, ", "));
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper end
|
2014-10-19 22:58:49 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
- private String format(double tps)
|
2016-02-29 23:09:49 +00:00
|
|
|
+ private static String format(double tps) // Paper - Made static
|
2014-10-19 22:58:49 +00:00
|
|
|
{
|
|
|
|
return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
|
|
|
|
+ ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
|
|
|
|
--
|
2019-04-08 10:51:36 +00:00
|
|
|
2.21.0
|
2014-10-19 22:58:49 +00:00
|
|
|
|