2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
|
|
Date: Sun, 5 Apr 2020 22:23:14 -0500
|
|
|
|
Subject: [PATCH] Add tick times API and /mspt command
|
|
|
|
|
|
|
|
|
2022-07-09 01:01:42 +02:00
|
|
|
diff --git a/src/main/java/io/papermc/paper/command/MSPTCommand.java b/src/main/java/io/papermc/paper/command/MSPTCommand.java
|
2021-06-11 14:02:28 +02:00
|
|
|
new file mode 100644
|
2022-07-09 01:01:42 +02:00
|
|
|
index 0000000000000000000000000000000000000000..8b5293b0c696ef21d0101493ffa41b60bf0bc86b
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
2022-07-09 01:01:42 +02:00
|
|
|
+++ b/src/main/java/io/papermc/paper/command/MSPTCommand.java
|
|
|
|
@@ -0,0 +1,102 @@
|
|
|
|
+package io.papermc.paper.command;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2022-06-03 06:26:56 +02:00
|
|
|
+import net.kyori.adventure.text.Component;
|
2021-06-11 14:02:28 +02:00
|
|
|
+import net.minecraft.server.MinecraftServer;
|
|
|
|
+import org.bukkit.Location;
|
|
|
|
+import org.bukkit.command.Command;
|
|
|
|
+import org.bukkit.command.CommandSender;
|
|
|
|
+
|
|
|
|
+import java.text.DecimalFormat;
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+import java.util.Arrays;
|
|
|
|
+import java.util.Collections;
|
|
|
|
+import java.util.List;
|
2022-07-09 01:01:42 +02:00
|
|
|
+import org.checkerframework.checker.nullness.qual.NonNull;
|
|
|
|
+import org.checkerframework.framework.qual.DefaultQualifier;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2022-06-03 06:26:56 +02:00
|
|
|
+import static net.kyori.adventure.text.Component.text;
|
|
|
|
+import static net.kyori.adventure.text.format.NamedTextColor.GOLD;
|
|
|
|
+import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
|
|
|
|
+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
|
|
|
|
+import static net.kyori.adventure.text.format.NamedTextColor.RED;
|
|
|
|
+import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
|
|
|
|
+
|
2022-07-09 01:01:42 +02:00
|
|
|
+@DefaultQualifier(NonNull.class)
|
|
|
|
+public final class MSPTCommand extends Command {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ private static final DecimalFormat DF = new DecimalFormat("########0.0");
|
2022-06-03 06:26:56 +02:00
|
|
|
+ private static final Component SLASH = text("/");
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2022-07-09 01:01:42 +02:00
|
|
|
+ public MSPTCommand(final String name) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ super(name);
|
|
|
|
+ this.description = "View server tick times";
|
|
|
|
+ this.usageMessage = "/mspt";
|
|
|
|
+ this.setPermission("bukkit.command.mspt");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
|
|
|
|
+ return Collections.emptyList();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean execute(CommandSender sender, String commandLabel, String[] args) {
|
|
|
|
+ if (!testPermission(sender)) return true;
|
|
|
|
+
|
|
|
|
+ MinecraftServer server = MinecraftServer.getServer();
|
|
|
|
+
|
2022-06-03 06:26:56 +02:00
|
|
|
+ List<Component> times = new ArrayList<>();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ times.addAll(eval(server.tickTimes5s.getTimes()));
|
|
|
|
+ times.addAll(eval(server.tickTimes10s.getTimes()));
|
|
|
|
+ times.addAll(eval(server.tickTimes60s.getTimes()));
|
|
|
|
+
|
2022-06-03 06:26:56 +02:00
|
|
|
+ sender.sendMessage(text().content("Server tick times ").color(GOLD)
|
|
|
|
+ .append(text().color(YELLOW)
|
|
|
|
+ .append(
|
|
|
|
+ text("("),
|
|
|
|
+ text("avg", GRAY),
|
|
|
|
+ text("/"),
|
|
|
|
+ text("min", GRAY),
|
|
|
|
+ text("/"),
|
|
|
|
+ text("max", GRAY),
|
|
|
|
+ text(")")
|
|
|
|
+ )
|
|
|
|
+ ).append(
|
|
|
|
+ text(" from last 5s"),
|
|
|
|
+ text(",", GRAY),
|
|
|
|
+ text(" 10s"),
|
|
|
|
+ text(",", GRAY),
|
|
|
|
+ text(" 1m"),
|
|
|
|
+ text(":", YELLOW)
|
|
|
|
+ )
|
|
|
|
+ );
|
|
|
|
+ sender.sendMessage(text().content("◴ ").color(GOLD)
|
|
|
|
+ .append(text().color(GRAY)
|
|
|
|
+ .append(
|
|
|
|
+ times.get(0), SLASH, times.get(1), SLASH, times.get(2), text(", ", YELLOW),
|
|
|
|
+ times.get(3), SLASH, times.get(4), SLASH, times.get(5), text(", ", YELLOW),
|
|
|
|
+ times.get(6), SLASH, times.get(7), SLASH, times.get(8)
|
|
|
|
+ )
|
|
|
|
+ )
|
|
|
|
+ );
|
2021-06-11 14:02:28 +02:00
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+
|
2022-06-03 06:26:56 +02:00
|
|
|
+ private static List<Component> eval(long[] times) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ long min = Integer.MAX_VALUE;
|
|
|
|
+ long max = 0L;
|
|
|
|
+ long total = 0L;
|
|
|
|
+ for (long value : times) {
|
|
|
|
+ if (value > 0L && value < min) min = value;
|
|
|
|
+ if (value > max) max = value;
|
|
|
|
+ total += value;
|
|
|
|
+ }
|
|
|
|
+ double avgD = ((double) total / (double) times.length) * 1.0E-6D;
|
|
|
|
+ double minD = ((double) min) * 1.0E-6D;
|
|
|
|
+ double maxD = ((double) max) * 1.0E-6D;
|
|
|
|
+ return Arrays.asList(getColor(avgD), getColor(minD), getColor(maxD));
|
|
|
|
+ }
|
|
|
|
+
|
2022-06-03 06:26:56 +02:00
|
|
|
+ private static Component getColor(double avg) {
|
|
|
|
+ return text(DF.format(avg), avg >= 50 ? RED : avg >= 40 ? YELLOW : GREEN);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+}
|
2022-06-09 23:43:27 +02:00
|
|
|
diff --git a/src/main/java/io/papermc/paper/command/PaperCommands.java b/src/main/java/io/papermc/paper/command/PaperCommands.java
|
2023-08-28 13:21:13 +02:00
|
|
|
index 72f2e81b9905a0d57ed8e2a88578f62d5235c456..7b58b2d6297800c2dcdbf7539e5ab8e7703f39f1 100644
|
2022-06-09 23:43:27 +02:00
|
|
|
--- a/src/main/java/io/papermc/paper/command/PaperCommands.java
|
|
|
|
+++ b/src/main/java/io/papermc/paper/command/PaperCommands.java
|
2023-08-28 13:21:13 +02:00
|
|
|
@@ -18,6 +18,7 @@ public final class PaperCommands {
|
2022-06-09 10:51:45 +02:00
|
|
|
static {
|
|
|
|
COMMANDS.put("paper", new PaperCommand("paper"));
|
2023-08-28 13:21:13 +02:00
|
|
|
COMMANDS.put("callback", new CallbackCommand("callback"));
|
2022-06-09 10:51:45 +02:00
|
|
|
+ COMMANDS.put("mspt", new MSPTCommand("mspt"));
|
|
|
|
}
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2022-06-09 10:51:45 +02:00
|
|
|
public static void registerCommands(final MinecraftServer server) {
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2023-12-05 23:55:31 +01:00
|
|
|
index 96fd66ed2742a79064852af6e936830ddaf14f4c..2deb639d404943ef5b028c4ede59cab99b31a40f 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2023-12-05 23:55:31 +01:00
|
|
|
@@ -252,6 +252,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
2021-06-11 14:02:28 +02:00
|
|
|
private int playerIdleTimeout;
|
2023-12-05 23:55:31 +01:00
|
|
|
private final long[] tickTimesNanos;
|
|
|
|
private long aggregatedTickTimesNanos;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper start
|
|
|
|
+ public final TickTimes tickTimes5s = new TickTimes(100);
|
|
|
|
+ public final TickTimes tickTimes10s = new TickTimes(200);
|
|
|
|
+ public final TickTimes tickTimes60s = new TickTimes(1200);
|
|
|
|
+ // Paper end
|
|
|
|
@Nullable
|
|
|
|
private KeyPair keyPair;
|
|
|
|
@Nullable
|
2023-12-05 23:55:31 +01:00
|
|
|
@@ -1399,6 +1404,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
|
|
this.smoothedTickTimeMillis = this.smoothedTickTimeMillis * 0.8F + (float) j / (float) TimeUtil.NANOSECONDS_PER_MILLISECOND * 0.19999999F;
|
|
|
|
long l = Util.getNanos();
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
+ // Paper start
|
2023-03-14 20:54:57 +01:00
|
|
|
+ tickTimes5s.add(this.tickCount, j);
|
|
|
|
+ tickTimes10s.add(this.tickCount, j);
|
|
|
|
+ tickTimes60s.add(this.tickCount, j);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper end
|
2023-12-05 23:55:31 +01:00
|
|
|
this.logTickTime(l - i);
|
2021-06-11 14:02:28 +02:00
|
|
|
this.profiler.pop();
|
|
|
|
org.spigotmc.WatchdogThread.tick(); // Spigot
|
2023-12-05 23:55:31 +01:00
|
|
|
@@ -2682,4 +2692,30 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
|
|
|
public static record ServerResourcePackInfo(UUID id, String url, String hash, boolean isRequired, @Nullable Component prompt) {
|
2022-06-08 06:06:41 +02:00
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
2022-06-08 06:06:41 +02:00
|
|
|
+
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper start
|
|
|
|
+ public static class TickTimes {
|
|
|
|
+ private final long[] times;
|
|
|
|
+
|
|
|
|
+ public TickTimes(int length) {
|
|
|
|
+ times = new long[length];
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ void add(int index, long time) {
|
|
|
|
+ times[index % times.length] = time;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public long[] getTimes() {
|
|
|
|
+ return times.clone();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public double getAverage() {
|
|
|
|
+ long total = 0L;
|
|
|
|
+ for (long value : times) {
|
|
|
|
+ total += value;
|
|
|
|
+ }
|
|
|
|
+ return ((double) total / (double) times.length) * 1.0E-6D;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
index 64d827c7e7f9cf76f9db900333b987a626ab53cc..0ace3d1efa29565d02602574347e24ed425c8f35 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10034)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
f29cb801 Separate checkstyle-suppressions file is not required
86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API
d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor
b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack
9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode()
994a6163 Attempt upgrade of resolver libraries
CraftBukkit Changes:
b3b43a6ad Add Checkstyle check for unused imports
13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names
3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API
2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor
1dbdbbed4 PR-1238: Remove unnecessary sign ticking
659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper
e37e29ce0 Increase outdated build delay
c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack
492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode()
e11fbb9d7 Upgrade MySQL driver
9f3a0bd2a Attempt upgrade of resolver libraries
60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion
Spigot Changes:
06d602e7 Rebuild patches
2023-12-17 03:09:28 +01:00
|
|
|
@@ -2629,6 +2629,16 @@ public final class CraftServer implements Server {
|
2021-06-11 14:02:28 +02:00
|
|
|
net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
|
|
|
|
};
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public long[] getTickTimes() {
|
|
|
|
+ return getServer().tickTimes5s.getTimes();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public double getAverageTickTime() {
|
|
|
|
+ return getServer().tickTimes5s.getAverage();
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
|
|
|
|
// Spigot start
|