mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-23 17:09:29 +00:00
113 lines
5.7 KiB
Diff
113 lines
5.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Wed, 30 Nov 2022 12:42:32 +0100
|
|
Subject: [PATCH] 5 second TPS average
|
|
|
|
License: MIT (https://opensource.org/licenses/MIT)
|
|
Gale - https://galemc.org
|
|
|
|
This patch is based on the following patch:
|
|
"Add 5 second tps average in /tps"
|
|
By: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
As part of: Purpur (https://github.com/PurpurMC/Purpur)
|
|
Licensed under: MIT (https://opensource.org/licenses/MIT)
|
|
|
|
* Purpur copyright *
|
|
|
|
MIT License
|
|
|
|
Copyright (c) 2019-2022 PurpurMC
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
of this software and associated documentation files (the "Software"), to deal
|
|
in the Software without restriction, including without limitation the rights
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
The above copyright notice and this permission notice shall be included in all
|
|
copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
SOFTWARE.
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
|
|
index 12b327eea95e0de9e9c39b7d039badee8ec46508..6178f0212214a2a075cea60c758dca793a61951b 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/gui/RAMDetails.java
|
|
@@ -61,6 +61,7 @@ public class RAMDetails extends JList<String> {
|
|
|
|
// Follows CraftServer#getTPS
|
|
double[] tps = new double[] {
|
|
+ server.tps5s.getAverage(), // Gale - Purpur - 5 second TPS average
|
|
server.tps1.getAverage(),
|
|
server.tps5.getAverage(),
|
|
server.tps15.getAverage()
|
|
@@ -73,7 +74,7 @@ public class RAMDetails extends JList<String> {
|
|
vector.add("Memory use: " + (data.getUsedMem() / 1024L / 1024L) + " mb (" + (data.getFree() * 100L / data.getMax()) + "% free)");
|
|
vector.add("Heap: " + (data.getTotal() / 1024L / 1024L) + " / " + (data.getMax() / 1024L / 1024L) + " mb");
|
|
vector.add("Avg tick: " + DECIMAL_FORMAT.format((double)this.server.getAverageTickTimeNanos() / (double) TimeUtil.NANOSECONDS_PER_MILLISECOND) + " ms");
|
|
- vector.add("TPS from last 1m, 5m, 15m: " + String.join(", ", tpsAvg));
|
|
+ vector.add("TPS from last 5s, 1m, 5m, 15m: " + String.join(", ", tpsAvg)); // Gale - Purpur - 5 second TPS average
|
|
setListData(vector);
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index c01a6fa34b150b617da2a8094eaa51a92f37a49a..98c1159814baf02a136161813aab9f315c2c3148 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -3079,7 +3079,26 @@ public final class CraftServer implements Server {
|
|
};
|
|
}
|
|
|
|
+ // Gale start - Purpur - 5 second TPS average
|
|
+ @Override
|
|
+ public double[] getTPSIncluding5SecondAverage() {
|
|
+ return new double[] {
|
|
+ net.minecraft.server.MinecraftServer.getServer().tps5s.getAverage(),
|
|
+ net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
|
|
+ net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
|
|
+ net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
|
|
+ };
|
|
+ }
|
|
+ // Gale end - Purpur - 5 second TPS average
|
|
+
|
|
// Gale start - specific interval TPS API
|
|
+ // Gale start - Purpur - 5 second TPS average
|
|
+ @Override
|
|
+ public double get5SecondTPSAverage() {
|
|
+ return net.minecraft.server.MinecraftServer.getServer().tps5s.getAverage();
|
|
+ }
|
|
+ // Gale end - Purpur - 5 second TPS average
|
|
+
|
|
@Override
|
|
public double get1MinuteTPSAverage() {
|
|
return net.minecraft.server.MinecraftServer.getServer().tps1.getAverage();
|
|
diff --git a/src/main/java/org/spigotmc/TicksPerSecondCommand.java b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
|
|
index 6d4851aa8c53793bfaf650f399fc5e2a98dbbb24..d336b27ee314366fe44760db6fdb68370ab3995a 100644
|
|
--- a/src/main/java/org/spigotmc/TicksPerSecondCommand.java
|
|
+++ b/src/main/java/org/spigotmc/TicksPerSecondCommand.java
|
|
@@ -35,7 +35,7 @@ public class TicksPerSecondCommand extends Command {
|
|
}
|
|
|
|
// Paper start - Further improve tick handling
|
|
- double[] tps = org.bukkit.Bukkit.getTPS();
|
|
+ double[] tps = org.bukkit.Bukkit.getTPSIncluding5SecondAverage(); // Gale - Purpur - 5 second TPS average
|
|
Component[] tpsAvg = new Component[tps.length];
|
|
|
|
for (int i = 0; i < tps.length; i++) {
|
|
@@ -43,7 +43,7 @@ public class TicksPerSecondCommand extends Command {
|
|
}
|
|
|
|
TextComponent.Builder builder = text();
|
|
- builder.append(text("TPS from last 1m, 5m, 15m: ", NamedTextColor.GOLD));
|
|
+ builder.append(text("TPS from last 5s, 1m, 5m, 15m: ", NamedTextColor.GOLD)); // Gale - Purpur - 5 second TPS average
|
|
builder.append(Component.join(JoinConfiguration.commas(true), tpsAvg));
|
|
sender.sendMessage(builder.asComponent());
|
|
if (args.length > 0 && args[0].equals("mem") && sender.hasPermission("bukkit.command.tpsmemory")) {
|