2020-05-02 00:03:47 +02:00
From f0fe55e3dd96e50f2eb4a56ca5a601d8e0c89a6a Mon Sep 17 00:00:00 2001
2016-01-09 07:32:38 +01:00
From: Aikar <aikar@aikar.co>
2016-03-03 10:46:26 +01:00
Date: Thu, 3 Mar 2016 04:00:11 -0600
2016-01-09 07:32:38 +01:00
Subject: [PATCH] Timings v2
2016-04-30 03:23:40 +02:00
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
2016-01-10 08:33:27 +01:00
new file mode 100644
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
index 0000000000..223d3b1125
2016-01-10 08:33:27 +01:00
--- /dev/null
2016-04-30 03:23:40 +02:00
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
2019-12-15 23:39:25 +01:00
@@ -0,0 +1,141 @@
2018-09-03 16:38:28 +02:00
+package co.aikar.timings;
2016-01-10 08:33:27 +01:00
+
2018-09-03 16:04:50 +02:00
+import com.google.common.collect.MapMaker;
2016-01-10 08:33:27 +01:00
+import net.minecraft.server.*;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitTask;
+
+import org.bukkit.craftbukkit.scheduler.CraftTask;
+
2018-09-03 16:04:50 +02:00
+import java.util.Map;
+
2019-04-24 03:00:24 +02:00
+// TODO: Re-implement missing timers
2016-04-30 03:23:40 +02:00
+public final class MinecraftTimings {
2016-01-10 08:33:27 +01:00
+
2019-09-29 22:49:38 +02:00
+ public static final Timing serverOversleep = Timings.ofSafe("Server Oversleep");
2016-01-10 08:33:27 +01:00
+ public static final Timing playerListTimer = Timings.ofSafe("Player List");
2017-05-14 20:05:01 +02:00
+ public static final Timing commandFunctionsTimer = Timings.ofSafe("Command Functions");
2016-01-10 08:33:27 +01:00
+ public static final Timing connectionTimer = Timings.ofSafe("Connection Handler");
+ public static final Timing tickablesTimer = Timings.ofSafe("Tickables");
2016-02-24 05:35:34 +01:00
+ public static final Timing minecraftSchedulerTimer = Timings.ofSafe("Minecraft Scheduler");
+ public static final Timing bukkitSchedulerTimer = Timings.ofSafe("Bukkit Scheduler");
2017-02-05 06:13:16 +01:00
+ public static final Timing bukkitSchedulerPendingTimer = Timings.ofSafe("Bukkit Scheduler - Pending");
+ public static final Timing bukkitSchedulerFinishTimer = Timings.ofSafe("Bukkit Scheduler - Finishing");
2016-01-10 08:33:27 +01:00
+ public static final Timing chunkIOTickTimer = Timings.ofSafe("ChunkIOTick");
+ public static final Timing timeUpdateTimer = Timings.ofSafe("Time Update");
+ public static final Timing serverCommandTimer = Timings.ofSafe("Server Command");
2016-10-21 22:42:49 +02:00
+ public static final Timing savePlayers = Timings.ofSafe("Save Players");
2016-01-10 08:33:27 +01:00
+
+ public static final Timing tickEntityTimer = Timings.ofSafe("## tickEntity");
+ public static final Timing tickTileEntityTimer = Timings.ofSafe("## tickTileEntity");
2017-02-05 06:13:16 +01:00
+ public static final Timing packetProcessTimer = Timings.ofSafe("## Packet Processing");
+ public static final Timing scheduledBlocksTimer = Timings.ofSafe("## Scheduled Blocks");
+ public static final Timing structureGenerationTimer = Timings.ofSafe("Structure Generation");
2016-01-10 08:33:27 +01:00
+
+ public static final Timing processQueueTimer = Timings.ofSafe("processQueue");
2019-07-24 05:20:14 +02:00
+ public static final Timing processTasksTimer = Timings.ofSafe("processTasks");
2016-01-10 08:33:27 +01:00
+
+ public static final Timing playerCommandTimer = Timings.ofSafe("playerCommand");
+
+ public static final Timing entityActivationCheckTimer = Timings.ofSafe("entityActivationCheck");
+
+ public static final Timing antiXrayUpdateTimer = Timings.ofSafe("anti-xray - update");
+ public static final Timing antiXrayObfuscateTimer = Timings.ofSafe("anti-xray - obfuscate");
+
2018-11-24 06:28:04 +01:00
+ private static final Map<Class<?>, String> taskNameCache = new MapMaker().weakKeys().makeMap();
2018-09-03 16:04:50 +02:00
+
2016-04-30 03:23:40 +02:00
+ private MinecraftTimings() {}
2016-01-10 08:33:27 +01:00
+
+ /**
+ * Gets a timer associated with a plugins tasks.
+ * @param bukkitTask
+ * @param period
+ * @return
+ */
+ public static Timing getPluginTaskTimings(BukkitTask bukkitTask, long period) {
+ if (!bukkitTask.isSync()) {
2019-03-26 06:31:59 +01:00
+ return NullTimingHandler.NULL;
2016-01-10 08:33:27 +01:00
+ }
+ Plugin plugin;
+
2018-11-24 06:28:04 +01:00
+ CraftTask craftTask = (CraftTask) bukkitTask;
2016-01-10 08:33:27 +01:00
+
2018-11-24 06:28:04 +01:00
+ final Class<?> taskClass = craftTask.getTaskClass();
2016-01-10 08:33:27 +01:00
+ if (bukkitTask.getOwner() != null) {
+ plugin = bukkitTask.getOwner();
+ } else {
+ plugin = TimingsManager.getPluginByClassloader(taskClass);
+ }
+
2019-12-15 23:39:25 +01:00
+ final String taskname = taskNameCache.computeIfAbsent(taskClass, clazz -> {
+ try {
+ return clazz.isAnonymousClass() || clazz.isLocalClass()
+ ? clazz.getName()
+ : clazz.getCanonicalName();
+ } catch (Throwable ex) {
+ new Exception("Error occurred detecting class name", ex).printStackTrace();
+ return "MangledClassFile";
+ }
+ });
2016-01-10 08:33:27 +01:00
+
2017-02-05 06:13:16 +01:00
+ StringBuilder name = new StringBuilder(64);
+ name.append("Task: ").append(taskname);
2016-01-10 08:33:27 +01:00
+ if (period > 0) {
2017-02-05 06:13:16 +01:00
+ name.append(" (interval:").append(period).append(")");
2016-01-10 08:33:27 +01:00
+ } else {
2017-02-05 06:13:16 +01:00
+ name.append(" (Single)");
2016-01-10 08:33:27 +01:00
+ }
+
+ if (plugin == null) {
2017-02-05 06:13:16 +01:00
+ return Timings.ofSafe(null, name.toString());
2016-01-10 08:33:27 +01:00
+ }
+
2017-02-05 06:13:16 +01:00
+ return Timings.ofSafe(plugin, name.toString());
2016-01-10 08:33:27 +01:00
+ }
+
+ /**
+ * Get a named timer for the specified entity type to track type specific timings.
+ * @param entity
+ * @return
+ */
+ public static Timing getEntityTimings(Entity entity) {
+ String entityType = entity.getClass().getName();
+ return Timings.ofSafe("Minecraft", "## tickEntity - " + entityType, tickEntityTimer);
+ }
+
+ /**
+ * Get a named timer for the specified tile entity type to track type specific timings.
+ * @param entity
+ * @return
+ */
+ public static Timing getTileEntityTimings(TileEntity entity) {
+ String entityType = entity.getClass().getName();
+ return Timings.ofSafe("Minecraft", "## tickTileEntity - " + entityType, tickTileEntityTimer);
+ }
+ public static Timing getCancelTasksTimer() {
+ return Timings.ofSafe("Cancel Tasks");
+ }
+ public static Timing getCancelTasksTimer(Plugin plugin) {
+ return Timings.ofSafe(plugin, "Cancel Tasks");
+ }
+
+ public static void stopServer() {
+ TimingsManager.stopServer();
+ }
+
+ public static Timing getBlockTiming(Block block) {
2018-07-15 03:53:17 +02:00
+ return Timings.ofSafe("## Scheduled Block: " + block.toString(), scheduledBlocksTimer);
2016-01-10 08:33:27 +01:00
+ }
2018-07-15 03:53:17 +02:00
+/*
2016-08-28 02:36:26 +02:00
+ public static Timing getStructureTiming(StructureGenerator structureGenerator) {
2017-02-05 06:13:16 +01:00
+ return Timings.ofSafe("Structure Generator - " + structureGenerator.getName(), structureGenerationTimer);
2018-07-15 03:53:17 +02:00
+ }*/
2017-02-05 06:13:16 +01:00
+
+ public static Timing getPacketTiming(Packet packet) {
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
+ return Timings.ofSafe("## Packet - " + packet.getClass().getName(), packetProcessTimer);
2016-08-28 02:36:26 +02:00
+ }
2018-08-28 00:30:58 +02:00
+
+ public static Timing getCommandFunctionTiming(CustomFunction function) {
+ return Timings.ofSafe("Command Function - " + function.getMinecraftKey().toString());
+ }
2016-08-28 02:36:26 +02:00
+}
2016-01-10 08:33:27 +01:00
diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
new file mode 100644
2020-04-26 08:05:41 +02:00
index 0000000000..fa1c920ea6
2016-01-10 08:33:27 +01:00
--- /dev/null
+++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
2020-04-26 08:05:41 +02:00
@@ -0,0 +1,118 @@
2016-01-10 08:33:27 +01:00
+package co.aikar.timings;
+
+import net.minecraft.server.World;
2018-07-15 03:53:17 +02:00
+import net.minecraft.server.WorldServer;
2016-01-10 08:33:27 +01:00
+
+/**
+ * Set of timers per world, to track world specific timings.
+ */
2019-04-24 03:00:24 +02:00
+// TODO: Re-implement missing timers
2016-01-10 08:33:27 +01:00
+public class WorldTimingsHandler {
+ public final Timing mobSpawn;
+ public final Timing doChunkUnload;
+ public final Timing doPortalForcer;
+ public final Timing scheduledBlocks;
+ public final Timing scheduledBlocksCleanup;
+ public final Timing scheduledBlocksTicking;
+ public final Timing chunkTicks;
2016-08-28 02:36:26 +02:00
+ public final Timing lightChunk;
2016-01-10 08:33:27 +01:00
+ public final Timing chunkTicksBlocks;
+ public final Timing doVillages;
+ public final Timing doChunkMap;
2016-06-05 06:10:50 +02:00
+ public final Timing doChunkMapUpdate;
+ public final Timing doChunkMapToUpdate;
+ public final Timing doChunkMapSortMissing;
+ public final Timing doChunkMapSortSendToPlayers;
+ public final Timing doChunkMapPlayersNeedingChunks;
+ public final Timing doChunkMapPendingSendToPlayers;
+ public final Timing doChunkMapUnloadChunks;
2016-01-10 08:33:27 +01:00
+ public final Timing doChunkGC;
+ public final Timing doSounds;
+ public final Timing entityRemoval;
+ public final Timing entityTick;
+ public final Timing tileEntityTick;
+ public final Timing tileEntityPending;
2016-04-30 03:23:40 +02:00
+ public final Timing tracker1;
+ public final Timing tracker2;
2016-01-10 08:33:27 +01:00
+ public final Timing doTick;
+ public final Timing tickEntities;
2019-07-24 05:20:14 +02:00
+ public final Timing chunks;
+ public final Timing newEntities;
+ public final Timing raids;
+ public final Timing chunkProviderTick;
+ public final Timing broadcastChunkUpdates;
+ public final Timing countNaturalMobs;
2016-01-10 08:33:27 +01:00
+
2020-04-26 08:05:41 +02:00
+ public final Timing chunkLoad;
+ public final Timing chunkLoadPopulate;
+ public final Timing syncChunkLoad;
2018-07-15 03:53:17 +02:00
+ public final Timing chunkLoadLevelTimer;
2020-04-26 08:05:41 +02:00
+ public final Timing chunkIO;
+ public final Timing chunkPostLoad;
2016-10-21 22:42:49 +02:00
+ public final Timing worldSave;
+ public final Timing worldSaveChunks;
+ public final Timing worldSaveLevel;
+ public final Timing chunkSaveData;
2016-01-10 08:33:27 +01:00
+
2019-09-29 23:06:03 +02:00
+
+ public final Timing miscMobSpawning;
+
2016-01-10 08:33:27 +01:00
+ public WorldTimingsHandler(World server) {
+ String name = server.worldData.getName() +" - ";
+
+ mobSpawn = Timings.ofSafe(name + "mobSpawn");
+ doChunkUnload = Timings.ofSafe(name + "doChunkUnload");
+ scheduledBlocks = Timings.ofSafe(name + "Scheduled Blocks");
+ scheduledBlocksCleanup = Timings.ofSafe(name + "Scheduled Blocks - Cleanup");
+ scheduledBlocksTicking = Timings.ofSafe(name + "Scheduled Blocks - Ticking");
+ chunkTicks = Timings.ofSafe(name + "Chunk Ticks");
2016-08-28 02:36:26 +02:00
+ lightChunk = Timings.ofSafe(name + "Light Chunk");
2016-01-10 08:33:27 +01:00
+ chunkTicksBlocks = Timings.ofSafe(name + "Chunk Ticks - Blocks");
+ doVillages = Timings.ofSafe(name + "doVillages");
+ doChunkMap = Timings.ofSafe(name + "doChunkMap");
2016-06-05 06:10:50 +02:00
+ doChunkMapUpdate = Timings.ofSafe(name + "doChunkMap - Update");
+ doChunkMapToUpdate = Timings.ofSafe(name + "doChunkMap - To Update");
+ doChunkMapSortMissing = Timings.ofSafe(name + "doChunkMap - Sort Missing");
+ doChunkMapSortSendToPlayers = Timings.ofSafe(name + "doChunkMap - Sort Send To Players");
+ doChunkMapPlayersNeedingChunks = Timings.ofSafe(name + "doChunkMap - Players Needing Chunks");
+ doChunkMapPendingSendToPlayers = Timings.ofSafe(name + "doChunkMap - Pending Send To Players");
+ doChunkMapUnloadChunks = Timings.ofSafe(name + "doChunkMap - Unload Chunks");
2016-01-10 08:33:27 +01:00
+ doSounds = Timings.ofSafe(name + "doSounds");
+ doChunkGC = Timings.ofSafe(name + "doChunkGC");
+ doPortalForcer = Timings.ofSafe(name + "doPortalForcer");
+ entityTick = Timings.ofSafe(name + "entityTick");
+ entityRemoval = Timings.ofSafe(name + "entityRemoval");
+ tileEntityTick = Timings.ofSafe(name + "tileEntityTick");
+ tileEntityPending = Timings.ofSafe(name + "tileEntityPending");
+
2020-04-26 08:05:41 +02:00
+ chunkLoad = Timings.ofSafe(name + "Chunk Load");
+ chunkLoadPopulate = Timings.ofSafe(name + "Chunk Load - Populate");
+ syncChunkLoad = Timings.ofSafe(name + "Sync Chunk Load");
+ chunkLoadLevelTimer = Timings.ofSafe(name + "Chunk Load - Load Level");
+ chunkIO = Timings.ofSafe(name + "Chunk Load - DiskIO");
+ chunkPostLoad = Timings.ofSafe(name + "Chunk Load - Post Load");
2016-10-21 22:42:49 +02:00
+ worldSave = Timings.ofSafe(name + "World Save");
+ worldSaveLevel = Timings.ofSafe(name + "World Save - Level");
+ worldSaveChunks = Timings.ofSafe(name + "World Save - Chunks");
+ chunkSaveData = Timings.ofSafe(name + "Chunk Save - Data");
2016-01-10 08:33:27 +01:00
+
2016-04-30 03:23:40 +02:00
+ tracker1 = Timings.ofSafe(name + "tracker stage 1");
+ tracker2 = Timings.ofSafe(name + "tracker stage 2");
2016-01-10 08:33:27 +01:00
+ doTick = Timings.ofSafe(name + "doTick");
+ tickEntities = Timings.ofSafe(name + "tickEntities");
2019-07-24 05:20:14 +02:00
+
+ chunks = Timings.ofSafe(name + "Chunks");
+ newEntities = Timings.ofSafe(name + "New entity registration");
+ raids = Timings.ofSafe(name + "Raids");
+ chunkProviderTick = Timings.ofSafe(name + "Chunk provider tick");
+ broadcastChunkUpdates = Timings.ofSafe(name + "Broadcast chunk updates");
+ countNaturalMobs = Timings.ofSafe(name + "Count natural mobs");
2019-09-29 23:06:03 +02:00
+
+
+ miscMobSpawning = Timings.ofSafe(name + "Mob spawning - Misc");
2016-01-10 08:33:27 +01:00
+ }
2018-07-15 03:53:17 +02:00
+
+ public static Timing getTickList(WorldServer worldserver, String timingsType) {
+ return Timings.ofSafe(worldserver.getWorldData().getName() + " - Scheduled " + timingsType);
+ }
2016-01-10 08:33:27 +01:00
+}
2016-03-01 00:09:49 +01:00
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
2020-04-24 11:33:33 +02:00
index b6d470e594..f402a29b09 100644
2016-03-01 00:09:49 +01:00
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
2016-05-02 05:54:08 +02:00
@@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
2016-03-01 00:09:49 +01:00
import java.util.logging.Level;
2016-05-02 05:54:08 +02:00
import java.util.regex.Pattern;
2016-03-01 00:09:49 +01:00
+import com.google.common.collect.Lists;
import net.minecraft.server.MinecraftServer;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
+import co.aikar.timings.Timings;
+import co.aikar.timings.TimingsManager;
public class PaperConfig {
2019-05-06 09:20:16 +02:00
@@ -187,4 +190,27 @@ public class PaperConfig {
2016-03-25 05:59:37 +01:00
config.addDefault(path, def);
return config.getString(path, config.getString(path));
2016-03-01 00:09:49 +01:00
}
+
2019-05-06 09:20:16 +02:00
+ public static String timingsServerName;
2016-03-01 00:09:49 +01:00
+ private static void timings() {
+ boolean timings = getBoolean("timings.enabled", true);
+ boolean verboseTimings = getBoolean("timings.verbose", true);
+ TimingsManager.privacy = getBoolean("timings.server-name-privacy", false);
+ TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses"));
+ int timingHistoryInterval = getInt("timings.history-interval", 300);
+ int timingHistoryLength = getInt("timings.history-length", 3600);
2019-05-06 09:20:16 +02:00
+ timingsServerName = getString("timings.server-name", "Unknown Server");
2016-03-01 00:09:49 +01:00
+
+
+ Timings.setVerboseTimingsEnabled(verboseTimings);
+ Timings.setTimingsEnabled(timings);
+ Timings.setHistoryInterval(timingHistoryInterval * 20);
+ Timings.setHistoryLength(timingHistoryLength * 20);
+
2017-03-25 04:18:58 +01:00
+ log("Timings: " + timings +
2016-03-01 00:09:49 +01:00
+ " - Verbose: " + verboseTimings +
+ " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
2019-05-06 09:20:16 +02:00
+ " - Length: " + timeSummary(Timings.getHistoryLength() / 20) +
+ " - Server Name: " + timingsServerName);
2016-03-01 00:09:49 +01:00
+ }
}
2016-01-09 07:32:38 +01:00
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
2020-04-24 11:33:33 +02:00
index cd72a9c845..5de881371a 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
2019-05-28 01:01:45 +02:00
@@ -31,6 +31,15 @@ public class Block implements IMaterial {
2019-04-24 03:00:24 +02:00
protected final boolean q;
2018-08-26 20:11:49 +02:00
protected final SoundEffectType stepSound;
protected final Material material;
+ // Paper start
2016-01-10 08:33:27 +01:00
+ public co.aikar.timings.Timing timing;
+ public co.aikar.timings.Timing getTiming() {
2016-01-09 07:32:38 +01:00
+ if (timing == null) {
2016-04-30 03:23:40 +02:00
+ timing = co.aikar.timings.MinecraftTimings.getBlockTiming(this);
2016-01-09 07:32:38 +01:00
+ }
+ return timing;
+ }
2016-03-01 00:09:49 +01:00
+ // Paper end
2019-04-24 03:00:24 +02:00
protected final MaterialMapColor t;
2018-08-26 20:11:49 +02:00
private final float frictionFactor;
2019-12-11 01:56:03 +01:00
private final float f;
2018-09-29 01:31:59 +02:00
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
2020-04-26 08:05:41 +02:00
index 2b6fe2e01d..4cd353b253 100644
2018-09-29 01:31:59 +02:00
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
2020-04-13 07:34:18 +02:00
@@ -675,6 +675,7 @@ public class Chunk implements IChunkAccess {
2018-09-29 01:31:59 +02:00
server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkLoadEvent(this.bukkitChunk, this.needsDecoration));
if (this.needsDecoration) {
2020-04-26 08:05:41 +02:00
+ try (co.aikar.timings.Timing ignored = this.world.timings.chunkLoadPopulate.startTiming()) { // Paper
2019-05-26 03:56:30 +02:00
this.needsDecoration = false;
2018-09-29 01:31:59 +02:00
java.util.Random random = new java.util.Random();
random.setSeed(world.getSeed());
2020-04-13 07:34:18 +02:00
@@ -694,6 +695,7 @@ public class Chunk implements IChunkAccess {
2019-04-24 03:00:24 +02:00
}
2018-09-29 01:31:59 +02:00
}
server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(bukkitChunk));
2019-05-20 03:32:41 +02:00
+ } // Paper
2018-09-29 01:31:59 +02:00
}
}
2018-07-15 03:53:17 +02:00
}
2016-10-21 22:42:49 +02:00
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
2020-04-26 08:05:41 +02:00
index ba2af2abe2..875f353dc3 100644
2016-10-21 22:42:49 +02:00
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
2020-04-24 11:33:33 +02:00
@@ -308,11 +308,13 @@ public class ChunkProviderServer extends IChunkProvider {
2019-07-12 06:04:38 +02:00
}
2020-01-22 03:02:07 +01:00
gameprofilerfiller.c("getChunkCacheMiss");
2019-07-12 06:04:38 +02:00
- world.timings.syncChunkLoadTimer.startTiming(); // Spigot
CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = this.getChunkFutureMainThread(i, j, chunkstatus, flag);
+ if (!completablefuture.isDone()) { // Paper
2020-04-26 08:05:41 +02:00
+ this.world.timings.syncChunkLoad.startTiming(); // Paper
2019-07-12 06:04:38 +02:00
this.serverThreadQueue.awaitTasks(completablefuture::isDone);
- world.timings.syncChunkLoadTimer.stopTiming(); // Spigot
2020-04-26 08:05:41 +02:00
+ this.world.timings.syncChunkLoad.stopTiming(); // Paper
2019-07-12 06:04:38 +02:00
+ } // Paper
ichunkaccess = (IChunkAccess) ((Either) completablefuture.join()).map((ichunkaccess1) -> {
return ichunkaccess1;
}, (playerchunk_failure) -> {
2020-04-24 11:33:33 +02:00
@@ -505,7 +507,9 @@ public class ChunkProviderServer extends IChunkProvider {
2018-08-26 20:11:49 +02:00
2019-04-24 03:00:24 +02:00
public void save(boolean flag) {
2019-05-28 01:01:45 +02:00
this.tickDistanceManager();
2019-04-24 03:00:24 +02:00
+ try (co.aikar.timings.Timing timed = world.timings.chunkSaveData.startTiming()) { // Paper - Timings
this.playerChunkMap.save(flag);
+ } // Paper - Timings
}
@Override
2020-04-24 11:33:33 +02:00
@@ -542,7 +546,9 @@ public class ChunkProviderServer extends IChunkProvider {
2019-07-24 05:20:14 +02:00
this.tickDistanceManager();
this.world.timings.doChunkMap.stopTiming(); // Spigot
this.world.getMethodProfiler().exitEnter("chunks");
+ this.world.timings.chunks.startTiming(); // Paper - timings
this.tickChunks();
+ this.world.timings.chunks.stopTiming(); // Paper - timings
this.world.timings.doChunkUnload.startTiming(); // Spigot
this.world.getMethodProfiler().exitEnter("unload");
this.playerChunkMap.unloadChunks(booleansupplier);
2020-04-24 11:33:33 +02:00
@@ -573,10 +579,12 @@ public class ChunkProviderServer extends IChunkProvider {
2020-03-10 12:01:15 +01:00
// CraftBukkit end
2019-07-24 05:20:14 +02:00
this.world.getMethodProfiler().enter("naturalSpawnCount");
+ this.world.timings.countNaturalMobs.startTiming(); // Paper - timings
int l = this.chunkMapDistance.b();
EnumCreatureType[] aenumcreaturetype = EnumCreatureType.values();
Object2IntMap<EnumCreatureType> object2intmap = this.world.l();
+ this.world.timings.countNaturalMobs.stopTiming(); // Paper - timings
this.world.getMethodProfiler().exit();
this.playerChunkMap.f().forEach((playerchunk) -> {
Optional<Chunk> optional = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left();
2020-04-24 11:33:33 +02:00
@@ -585,11 +593,14 @@ public class ChunkProviderServer extends IChunkProvider {
2019-07-24 05:20:14 +02:00
Chunk chunk = (Chunk) optional.get();
this.world.getMethodProfiler().enter("broadcast");
+ this.world.timings.broadcastChunkUpdates.startTiming(); // Paper - timings
playerchunk.a(chunk);
+ this.world.timings.broadcastChunkUpdates.stopTiming(); // Paper - timings
this.world.getMethodProfiler().exit();
ChunkCoordIntPair chunkcoordintpair = playerchunk.i();
2020-03-02 20:56:04 +01:00
if (!this.playerChunkMap.isOutsideOfRange(chunkcoordintpair)) {
2019-09-29 23:06:03 +02:00
+ // Paper end
2019-12-11 01:56:03 +01:00
chunk.setInhabitedTime(chunk.getInhabitedTime() + j);
2020-03-02 20:56:04 +01:00
if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos()) && !this.playerChunkMap.isOutsideOfRange(chunkcoordintpair, true)) { // Spigot
2019-09-29 23:06:03 +02:00
this.world.getMethodProfiler().enter("spawner");
2020-04-24 11:33:33 +02:00
@@ -640,24 +651,24 @@ public class ChunkProviderServer extends IChunkProvider {
2019-04-24 03:00:24 +02:00
this.world.getMethodProfiler().exit();
}
2019-05-14 04:20:58 +02:00
2019-04-24 03:00:24 +02:00
- this.world.timings.doTickTiles.startTiming(); // Spigot
+ this.world.timings.chunkTicks.startTiming(); // Spigot // Paper
2019-05-14 04:20:58 +02:00
this.world.a(chunk, k);
2019-04-24 03:00:24 +02:00
- this.world.timings.doTickTiles.stopTiming(); // Spigot
+ this.world.timings.chunkTicks.stopTiming(); // Spigot // Paper
}
}
2019-06-25 03:47:58 +02:00
});
2019-09-29 23:06:03 +02:00
this.world.getMethodProfiler().enter("customSpawners");
if (flag1) {
+ try (co.aikar.timings.Timing ignored = this.world.timings.miscMobSpawning.startTiming()) { // Paper - timings
this.chunkGenerator.doMobSpawning(this.world, this.allowMonsters, this.allowAnimals);
+ } // Paper - timings
}
this.world.getMethodProfiler().exit();
2019-05-14 04:20:58 +02:00
this.world.getMethodProfiler().exit();
2018-07-22 07:27:46 +02:00
}
2019-04-24 03:00:24 +02:00
- this.world.timings.tracker.startTiming(); // Spigot
this.playerChunkMap.g();
- this.world.timings.tracker.stopTiming(); // Spigot
2016-10-21 22:42:49 +02:00
}
2019-04-24 03:00:24 +02:00
@Override
2016-08-28 02:36:26 +02:00
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
2020-04-26 08:05:41 +02:00
index e16d30f2ca..13d99de2cd 100644
2016-08-28 02:36:26 +02:00
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
2018-07-15 03:53:17 +02:00
@@ -1,5 +1,6 @@
package net.minecraft.server;
2016-08-28 02:36:26 +02:00
2018-07-15 03:53:17 +02:00
+import co.aikar.timings.Timings;
import com.google.common.collect.Maps;
2019-04-24 03:00:24 +02:00
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
import it.unimi.dsi.fastutil.longs.LongSet;
2020-04-26 08:05:41 +02:00
@@ -388,7 +389,6 @@ public class ChunkRegionLoader {
2019-04-24 03:00:24 +02:00
private static void loadEntities(NBTTagCompound nbttagcompound, Chunk chunk) {
2018-07-15 03:53:17 +02:00
NBTTagList nbttaglist = nbttagcompound.getList("Entities", 10);
World world = chunk.getWorld();
2016-08-28 02:36:26 +02:00
- world.timings.syncChunkLoadEntitiesTimer.startTiming(); // Spigot
2018-07-15 03:53:17 +02:00
for (int i = 0; i < nbttaglist.size(); ++i) {
NBTTagCompound nbttagcompound1 = nbttaglist.getCompound(i);
2020-04-26 08:05:41 +02:00
@@ -400,8 +400,6 @@ public class ChunkRegionLoader {
2019-04-24 03:00:24 +02:00
chunk.d(true);
2016-08-28 02:36:26 +02:00
}
2018-07-15 03:53:17 +02:00
2016-08-28 02:36:26 +02:00
- world.timings.syncChunkLoadEntitiesTimer.stopTiming(); // Spigot
- world.timings.syncChunkLoadTileEntitiesTimer.startTiming(); // Spigot
2018-07-15 03:53:17 +02:00
NBTTagList nbttaglist1 = nbttagcompound.getList("TileEntities", 10);
2016-08-28 02:36:26 +02:00
2018-07-15 03:53:17 +02:00
for (int j = 0; j < nbttaglist1.size(); ++j) {
2020-04-26 08:05:41 +02:00
@@ -418,8 +416,6 @@ public class ChunkRegionLoader {
2018-07-15 03:53:17 +02:00
}
2016-08-28 02:36:26 +02:00
}
}
- world.timings.syncChunkLoadTileEntitiesTimer.stopTiming(); // Spigot
2020-04-26 08:05:41 +02:00
-
2016-08-28 02:36:26 +02:00
}
2018-07-15 03:53:17 +02:00
2020-04-26 08:05:41 +02:00
private static NBTTagCompound a(ChunkCoordIntPair chunkcoordintpair, Map<String, StructureStart> map, Map<String, LongSet> map1) {
2018-08-28 00:30:58 +02:00
diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
2020-04-24 11:33:33 +02:00
index 8d7a6d2403..707bd2600d 100644
2018-08-28 00:30:58 +02:00
--- a/src/main/java/net/minecraft/server/CustomFunction.java
+++ b/src/main/java/net/minecraft/server/CustomFunction.java
2019-04-24 03:00:24 +02:00
@@ -13,12 +13,22 @@ public class CustomFunction {
2018-08-28 00:30:58 +02:00
private final CustomFunction.c[] a;
private final MinecraftKey b;
+ // Paper start
+ public co.aikar.timings.Timing timing;
+ public co.aikar.timings.Timing getTiming() {
+ if (timing == null) {
+ timing = co.aikar.timings.MinecraftTimings.getCommandFunctionTiming(this);
+ }
+ return timing;
+ }
+ // Paper end
public CustomFunction(MinecraftKey minecraftkey, CustomFunction.c[] acustomfunction_c) {
this.b = minecraftkey;
this.a = acustomfunction_c;
}
+ public MinecraftKey getMinecraftKey() { return this.a(); } // Paper - OBFHELPER
public MinecraftKey a() {
return this.b;
}
diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
2020-04-24 11:33:33 +02:00
index ba40d5fbb5..ee42e1dfa4 100644
2018-08-28 00:30:58 +02:00
--- a/src/main/java/net/minecraft/server/CustomFunctionData.java
+++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
2020-01-22 03:02:07 +01:00
@@ -103,7 +103,7 @@ public class CustomFunctionData implements IResourcePackListener {
2018-08-28 00:30:58 +02:00
} else {
2020-01-22 03:02:07 +01:00
int j;
2018-08-28 00:30:58 +02:00
- try {
+ try (co.aikar.timings.Timing timing = customfunction.getTiming().startTiming()) { // Paper
2019-05-14 04:20:58 +02:00
this.h = true;
2020-01-22 03:02:07 +01:00
int k = 0;
2018-08-28 00:30:58 +02:00
CustomFunction.c[] acustomfunction_c = customfunction.b();
2016-01-09 07:32:38 +01:00
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
2020-04-24 11:33:33 +02:00
index 9eed98e379..d6646d7e61 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
2020-01-22 03:02:07 +01:00
@@ -20,6 +20,8 @@ import java.util.List;
2019-06-25 03:47:58 +02:00
import java.util.Locale;
2020-01-22 03:02:07 +01:00
import java.util.Optional;
2019-06-25 03:47:58 +02:00
import java.util.Random;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
import java.util.function.BooleanSupplier;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
2020-01-22 03:02:07 +01:00
@@ -32,7 +34,7 @@ import org.apache.logging.log4j.Level;
2016-01-09 07:32:38 +01:00
2018-07-15 03:53:17 +02:00
import org.bukkit.command.CommandSender;
2016-01-09 07:32:38 +01:00
import org.bukkit.craftbukkit.LoggerOutputStream;
-import org.bukkit.craftbukkit.SpigotTimings; // Spigot
2016-04-30 03:23:40 +02:00
+import co.aikar.timings.MinecraftTimings; // Paper
2016-01-09 07:32:38 +01:00
import org.bukkit.event.server.ServerCommandEvent;
import org.bukkit.craftbukkit.util.Waitable;
import org.bukkit.event.server.RemoteServerCommandEvent;
2020-01-28 20:43:57 +01:00
@@ -438,7 +440,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
2016-04-30 03:23:40 +02:00
}
2018-12-17 06:18:06 +01:00
public void handleCommandQueue() {
2016-04-30 03:23:40 +02:00
- SpigotTimings.serverCommandTimer.startTiming(); // Spigot
+ MinecraftTimings.serverCommandTimer.startTiming(); // Spigot
while (!this.serverCommandQueue.isEmpty()) {
ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
2020-01-28 20:43:57 +01:00
@@ -453,7 +455,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
2016-04-30 03:23:40 +02:00
// CraftBukkit end
}
- SpigotTimings.serverCommandTimer.stopTiming(); // Spigot
+ MinecraftTimings.serverCommandTimer.stopTiming(); // Spigot
}
2019-04-24 03:00:24 +02:00
@Override
2020-01-28 20:43:57 +01:00
@@ -679,6 +681,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
2019-06-25 03:47:58 +02:00
@Override
public String executeRemoteCommand(String s) {
+ Waitable[] waitableArray = new Waitable[1];
this.remoteControlCommandListener.clearMessages();
this.executeSync(() -> {
// CraftBukkit start - fire RemoteServerCommandEvent
2020-01-28 20:43:57 +01:00
@@ -687,10 +690,39 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
2019-06-25 03:47:58 +02:00
if (event.isCancelled()) {
return;
2017-02-05 04:47:39 +01:00
}
2019-06-25 03:47:58 +02:00
+ // Paper start
+ if (s.toLowerCase().startsWith("timings") && s.toLowerCase().matches("timings (report|paste|get|merged|seperate)")) {
+ org.bukkit.command.BufferedCommandSender sender = new org.bukkit.command.BufferedCommandSender();
+ Waitable<String> waitable = new Waitable<String>() {
+ @Override
+ protected String evaluate() {
+ return sender.getBuffer();
+ }
+ };
+ waitableArray[0] = waitable;
+ co.aikar.timings.Timings.generateReport(new co.aikar.timings.TimingsReportListener(sender, waitable));
+ } else {
+ // Paper end
2019-07-20 06:01:24 +02:00
ServerCommand serverCommand = new ServerCommand(event.getCommand(), remoteControlCommandListener.getWrapper());
2019-06-25 03:47:58 +02:00
server.dispatchServerCommand(remoteConsole, serverCommand);
+ } // Paper
// CraftBukkit end
});
2017-02-05 04:47:39 +01:00
+ // Paper start
2019-06-25 03:47:58 +02:00
+ if (waitableArray[0] != null) {
+ //noinspection unchecked
+ Waitable<String> waitable = waitableArray[0];
+ try {
+ return waitable.get();
+ } catch (java.util.concurrent.ExecutionException e) {
+ throw new RuntimeException("Exception processing rcon command " + s, e.getCause());
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt(); // Maintain interrupted state
+ throw new RuntimeException("Interrupted processing rcon command " + s, e);
+ }
+
2017-02-05 04:47:39 +01:00
+ }
+ // Paper end
2019-06-25 03:47:58 +02:00
return this.remoteControlCommandListener.getMessages();
}
2016-01-09 07:32:38 +01:00
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
2020-04-27 09:34:45 +02:00
index fc878e28c9..c75b74d558 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2019-04-25 08:53:51 +02:00
@@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
2016-03-01 00:09:49 +01:00
import org.bukkit.entity.Hanging;
2016-01-09 07:32:38 +01:00
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Vehicle;
-import org.spigotmc.CustomTimingsHandler; // Spigot
2016-04-30 03:23:40 +02:00
+import co.aikar.timings.MinecraftTimings; // Paper
2016-03-01 00:09:49 +01:00
+import co.aikar.timings.Timing; // Paper
2016-01-09 07:32:38 +01:00
import org.bukkit.event.entity.EntityCombustByEntityEvent;
import org.bukkit.event.hanging.HangingBreakByEntityEvent;
2016-03-01 00:09:49 +01:00
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
2019-12-11 01:56:03 +01:00
@@ -165,7 +166,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
2017-11-08 17:13:57 +01:00
public boolean valid;
public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
public boolean forceExplosionKnockback; // SPIGOT-949
2016-01-09 07:32:38 +01:00
- public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
2016-04-30 03:23:40 +02:00
+ public Timing tickTimer = MinecraftTimings.getEntityTimings(this); // Paper
2016-03-01 00:09:49 +01:00
// Spigot start
2019-05-31 01:54:25 +02:00
public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
2016-01-09 07:32:38 +01:00
public final boolean defaultActivationState;
2020-02-21 18:52:20 +01:00
@@ -504,7 +505,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
2016-03-01 00:09:49 +01:00
}
2016-01-09 07:32:38 +01:00
2019-04-24 03:00:24 +02:00
public void move(EnumMoveType enummovetype, Vec3D vec3d) {
2016-01-09 07:32:38 +01:00
- org.bukkit.craftbukkit.SpigotTimings.entityMoveTimer.startTiming(); // Spigot
if (this.noclip) {
2019-04-24 03:00:24 +02:00
this.a(this.getBoundingBox().b(vec3d));
2016-03-01 00:09:49 +01:00
this.recalcPosition();
2020-02-21 18:52:20 +01:00
@@ -656,7 +656,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
2016-01-09 07:32:38 +01:00
2019-04-24 03:00:24 +02:00
this.world.getMethodProfiler().exit();
2016-01-09 07:32:38 +01:00
}
- org.bukkit.craftbukkit.SpigotTimings.entityMoveTimer.stopTiming(); // Spigot
}
2019-12-11 01:56:03 +01:00
protected BlockPosition ag() {
2016-01-09 07:32:38 +01:00
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
2020-04-27 09:34:45 +02:00
index 3ace8ee854..690c1ce0f6 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
2019-12-11 01:56:03 +01:00
@@ -37,7 +37,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
2016-03-01 00:09:49 +01:00
import org.bukkit.event.player.PlayerItemConsumeEvent;
2016-01-09 07:32:38 +01:00
// CraftBukkit end
-import org.bukkit.craftbukkit.SpigotTimings; // Spigot
2016-04-30 03:23:40 +02:00
+import co.aikar.timings.MinecraftTimings; // Paper
2016-01-09 07:32:38 +01:00
public abstract class EntityLiving extends Entity {
2020-04-27 09:34:45 +02:00
@@ -2265,7 +2265,6 @@ public abstract class EntityLiving extends Entity {
2016-01-09 07:32:38 +01:00
2019-04-24 03:00:24 +02:00
@Override
2018-07-15 03:53:17 +02:00
public void tick() {
2016-01-09 07:32:38 +01:00
- SpigotTimings.timerEntityBaseTick.startTiming(); // Spigot
2018-07-15 03:53:17 +02:00
super.tick();
this.o();
2019-12-11 01:56:03 +01:00
this.r();
2020-04-27 09:34:45 +02:00
@@ -2353,9 +2352,7 @@ public abstract class EntityLiving extends Entity {
2016-01-09 07:32:38 +01:00
}
}
- SpigotTimings.timerEntityBaseTick.stopTiming(); // Spigot
2018-12-17 06:18:06 +01:00
this.movementTick();
2016-01-09 07:32:38 +01:00
- SpigotTimings.timerEntityTickRest.startTiming(); // Spigot
2019-12-11 01:56:03 +01:00
double d0 = this.locX() - this.lastX;
double d1 = this.locZ() - this.lastZ;
2016-01-09 07:32:38 +01:00
float f = (float) (d0 * d0 + d1 * d1);
2020-04-27 09:34:45 +02:00
@@ -2435,8 +2432,6 @@ public abstract class EntityLiving extends Entity {
2019-04-24 03:00:24 +02:00
if (this.isSleeping()) {
this.pitch = 0.0F;
2016-03-01 00:09:49 +01:00
}
-
2016-01-09 07:32:38 +01:00
- SpigotTimings.timerEntityTickRest.stopTiming(); // Spigot
}
2019-12-11 01:56:03 +01:00
protected float f(float f, float f1) {
2020-04-27 09:34:45 +02:00
@@ -2515,7 +2510,6 @@ public abstract class EntityLiving extends Entity {
2016-01-09 07:32:38 +01:00
2019-04-24 03:00:24 +02:00
this.setMot(d4, d5, d6);
this.world.getMethodProfiler().enter("ai");
2016-01-09 07:32:38 +01:00
- SpigotTimings.timerEntityAI.startTiming(); // Spigot
2016-11-17 03:23:38 +01:00
if (this.isFrozen()) {
2019-04-24 03:00:24 +02:00
this.jumping = false;
2019-12-11 01:56:03 +01:00
this.aZ = 0.0F;
2020-04-27 09:34:45 +02:00
@@ -2525,7 +2519,6 @@ public abstract class EntityLiving extends Entity {
2016-01-09 07:32:38 +01:00
this.doTick();
2019-04-24 03:00:24 +02:00
this.world.getMethodProfiler().exit();
2016-01-09 07:32:38 +01:00
}
- SpigotTimings.timerEntityAI.stopTiming(); // Spigot
2019-04-24 03:00:24 +02:00
this.world.getMethodProfiler().exit();
this.world.getMethodProfiler().enter("jump");
2020-04-27 09:34:45 +02:00
@@ -2549,9 +2542,7 @@ public abstract class EntityLiving extends Entity {
2018-07-15 03:53:17 +02:00
this.n();
AxisAlignedBB axisalignedbb = this.getBoundingBox();
2016-01-09 07:32:38 +01:00
- SpigotTimings.timerEntityAIMove.startTiming(); // Spigot
2019-12-11 01:56:03 +01:00
this.e(new Vec3D((double) this.aZ, (double) this.ba, (double) this.bb));
2016-01-09 07:32:38 +01:00
- SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot
2019-04-24 03:00:24 +02:00
this.world.getMethodProfiler().exit();
this.world.getMethodProfiler().enter("push");
2019-12-11 01:56:03 +01:00
if (this.bn > 0) {
2020-04-27 09:34:45 +02:00
@@ -2559,9 +2550,7 @@ public abstract class EntityLiving extends Entity {
2018-07-15 03:53:17 +02:00
this.a(axisalignedbb, this.getBoundingBox());
}
2016-03-01 00:09:49 +01:00
- SpigotTimings.timerEntityAICollision.startTiming(); // Spigot
2019-04-24 03:00:24 +02:00
this.collideNearby();
2016-03-01 00:09:49 +01:00
- SpigotTimings.timerEntityAICollision.stopTiming(); // Spigot
2019-04-24 03:00:24 +02:00
this.world.getMethodProfiler().exit();
2016-04-30 03:23:40 +02:00
}
2016-01-09 07:32:38 +01:00
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
index b4a0bd7951..67bdd57747 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2019-07-20 06:01:24 +02:00
@@ -63,7 +63,7 @@ import org.bukkit.craftbukkit.CraftServer;
2016-07-16 00:36:53 +02:00
import org.bukkit.craftbukkit.Main;
2018-09-08 05:49:37 +02:00
import org.bukkit.event.server.ServerLoadEvent;
2016-01-09 07:32:38 +01:00
// CraftBukkit end
2016-03-01 00:09:49 +01:00
-import org.bukkit.craftbukkit.SpigotTimings; // Spigot
2016-04-30 03:23:40 +02:00
+import co.aikar.timings.MinecraftTimings; // Paper
2019-06-25 03:47:58 +02:00
import org.spigotmc.SlackActivityAccountant; // Spigot
2016-01-09 07:32:38 +01:00
2019-04-24 03:00:24 +02:00
public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements IMojangStatistics, ICommandListener, AutoCloseable, Runnable {
2019-09-29 22:49:38 +02:00
@@ -128,8 +128,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
});
});
private long nextTick = SystemUtils.getMonotonicMillis();
- private long ab;
- private boolean ac;
+ private long ab; final long getTickOversleepMaxTime() { return this.ab; } // Paper - OBFHELPER
+ private boolean ac; final boolean hasExecutedTask() { return this.ac; } // Paper - OBFHELPER
private final IReloadableResourceManager ae;
private final ResourcePackRepository<ResourcePackLoader> resourcePackRepository;
@Nullable
2020-01-22 03:02:07 +01:00
@@ -694,6 +694,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2016-03-01 00:09:49 +01:00
}
2016-01-09 07:32:38 +01:00
// CraftBukkit end
2016-03-01 00:09:49 +01:00
MinecraftServer.LOGGER.info("Stopping server");
2016-04-30 03:23:40 +02:00
+ MinecraftTimings.stopServer(); // Paper
2016-03-03 10:46:26 +01:00
// CraftBukkit start
if (this.server != null) {
this.server.disablePlugins();
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
@@ -881,9 +882,21 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
private boolean canSleepForTick() {
// CraftBukkit start
+ if (isOversleep) return canOversleep();// Paper - because of our changes, this logic is broken
2019-09-29 22:49:38 +02:00
return this.forceTicks || this.isEntered() || SystemUtils.getMonotonicMillis() < (this.ac ? this.ab : this.nextTick);
}
+ // Paper start
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
+ boolean isOversleep = false;
2019-09-29 22:49:38 +02:00
+ private boolean canOversleep() {
+ return this.hasExecutedTask() && SystemUtils.getMonotonicMillis() < this.getTickOversleepMaxTime();
+ }
+
+ private boolean canSleepForTickNoOversleep() {
+ return this.forceTicks || this.isEntered() || SystemUtils.getMonotonicMillis() < this.nextTick;
+ }
+ // Paper end
+
private void executeModerately() {
this.executeAll();
java.util.concurrent.locks.LockSupport.parkNanos("executing tasks", 1000L);
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
@@ -891,9 +904,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2019-07-24 05:20:14 +02:00
// CraftBukkit end
protected void sleepForTick() {
- this.executeAll();
+ //this.executeAll(); // Paper - move this into the tick method for timings
this.awaitTasks(() -> {
2019-09-29 22:49:38 +02:00
- return !this.canSleepForTick();
+ return !this.canSleepForTickNoOversleep(); // Paper - move oversleep into full server tick
2019-07-24 05:20:14 +02:00
});
2019-09-29 22:49:38 +02:00
}
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
@@ -976,10 +989,18 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2019-04-24 03:00:24 +02:00
protected void exit() {}
2016-01-09 07:32:38 +01:00
2018-08-26 20:11:49 +02:00
protected void a(BooleanSupplier booleansupplier) {
2016-01-09 07:32:38 +01:00
- SpigotTimings.serverTickTimer.startTiming(); // Spigot
2016-03-01 00:09:49 +01:00
+ co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTiming(); // Paper
2020-04-16 03:48:07 +02:00
this.slackActivityAccountant.tickStarted(); // Spigot
long i = SystemUtils.getMonotonicNanos();
2019-09-29 22:49:38 +02:00
+ // Paper start - move oversleep into full server tick
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
+ isOversleep = true;MinecraftTimings.serverOversleep.startTiming();
2019-09-29 22:49:38 +02:00
+ this.awaitTasks(() -> {
+ return !this.canOversleep();
+ });
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
+ isOversleep = false;MinecraftTimings.serverOversleep.stopTiming();
2019-09-29 22:49:38 +02:00
+ // Paper end
2020-04-16 03:48:07 +02:00
+
++this.ticks;
this.b(booleansupplier);
if (i - this.Z >= 5000000000L) {
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
@@ -997,14 +1018,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2016-04-30 03:23:40 +02:00
}
if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
- SpigotTimings.worldSaveTimer.startTiming(); // Spigot
2019-04-24 03:00:24 +02:00
MinecraftServer.LOGGER.debug("Autosave started");
2018-12-17 06:18:06 +01:00
this.methodProfiler.enter("save");
this.playerList.savePlayers();
2019-04-24 03:00:24 +02:00
this.saveChunks(true, false, false);
2018-12-17 06:18:06 +01:00
this.methodProfiler.exit();
2019-04-24 03:00:24 +02:00
MinecraftServer.LOGGER.debug("Autosave finished");
2016-04-30 03:23:40 +02:00
- SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
}
2018-12-17 06:18:06 +01:00
this.methodProfiler.enter("snooper");
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
@@ -1017,6 +1036,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2020-04-16 03:48:07 +02:00
}
2018-12-17 06:18:06 +01:00
this.methodProfiler.exit();
2020-04-16 03:48:07 +02:00
+
2019-07-24 05:20:14 +02:00
+ // Paper start - move executeAll() into full server tick timing
+ try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
+ this.executeAll();
+ }
+ // Paper end
2020-04-16 03:48:07 +02:00
+
this.methodProfiler.enter("tallying");
long l = this.f[this.ticks % 100] = SystemUtils.getMonotonicNanos() - i;
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
@@ -1027,30 +1053,29 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2020-04-16 03:48:07 +02:00
this.methodProfiler.exit();
org.spigotmc.WatchdogThread.tick(); // Spigot
this.slackActivityAccountant.tickEnded(l); // Spigot
- SpigotTimings.serverTickTimer.stopTiming(); // Spigot
- org.spigotmc.CustomTimingsHandler.tick(); // Spigot
2016-03-01 00:09:49 +01:00
+ co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
2016-01-09 07:32:38 +01:00
}
2019-04-24 03:00:24 +02:00
protected void b(BooleanSupplier booleansupplier) {
2016-06-30 07:38:53 +02:00
- SpigotTimings.schedulerTimer.startTiming(); // Spigot
2019-04-24 03:00:24 +02:00
+ MinecraftTimings.bukkitSchedulerTimer.startTiming(); // Spigot // Paper
2016-06-30 07:38:53 +02:00
this.server.getScheduler().mainThreadHeartbeat(this.ticks); // CraftBukkit
- SpigotTimings.schedulerTimer.stopTiming(); // Spigot
2019-04-24 03:00:24 +02:00
+ MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper
this.methodProfiler.enter("commandFunctions");
2018-07-15 03:53:17 +02:00
- SpigotTimings.commandFunctionsTimer.startTiming(); // Spigot
2019-04-24 03:00:24 +02:00
+ MinecraftTimings.commandFunctionsTimer.startTiming(); // Spigot // Paper
2018-12-17 06:18:06 +01:00
this.getFunctionData().tick();
2018-07-15 03:53:17 +02:00
- SpigotTimings.commandFunctionsTimer.stopTiming(); // Spigot
2019-04-24 03:00:24 +02:00
+ MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper
2018-12-17 06:18:06 +01:00
this.methodProfiler.exitEnter("levels");
2019-06-25 03:47:58 +02:00
Iterator iterator = this.getWorlds().iterator();
2016-02-24 05:35:34 +01:00
// CraftBukkit start
// Run tasks that are waiting on processing
2016-04-30 03:23:40 +02:00
- SpigotTimings.processQueueTimer.startTiming(); // Spigot
+ MinecraftTimings.processQueueTimer.startTiming(); // Spigot
while (!processQueue.isEmpty()) {
processQueue.remove().run();
}
- SpigotTimings.processQueueTimer.stopTiming(); // Spigot
+ MinecraftTimings.processQueueTimer.stopTiming(); // Spigot
- SpigotTimings.timeUpdateTimer.startTiming(); // Spigot
2019-04-24 03:00:24 +02:00
+ MinecraftTimings.timeUpdateTimer.startTiming(); // Spigot // Paper
2016-04-30 03:23:40 +02:00
// Send time updates to everyone, it will get the right time from the world the player is in.
if (this.ticks % 20 == 0) {
for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
@@ -1058,7 +1083,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2019-06-25 03:47:58 +02:00
entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE))); // Add support for per player time
2016-04-30 03:23:40 +02:00
}
}
- SpigotTimings.timeUpdateTimer.stopTiming(); // Spigot
2019-04-24 03:00:24 +02:00
+ MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
2016-04-30 03:23:40 +02:00
2019-06-25 03:47:58 +02:00
while (iterator.hasNext()) {
WorldServer worldserver = (WorldServer) iterator.next();
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
@@ -1101,24 +1126,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
2016-04-30 03:23:40 +02:00
}
2018-12-17 06:18:06 +01:00
this.methodProfiler.exitEnter("connection");
2016-04-30 03:23:40 +02:00
- SpigotTimings.connectionTimer.startTiming(); // Spigot
+ MinecraftTimings.connectionTimer.startTiming(); // Spigot
2018-07-15 03:53:17 +02:00
this.getServerConnection().c();
2016-04-30 03:23:40 +02:00
- SpigotTimings.connectionTimer.stopTiming(); // Spigot
+ MinecraftTimings.connectionTimer.stopTiming(); // Spigot
2018-12-17 06:18:06 +01:00
this.methodProfiler.exitEnter("players");
2016-04-30 03:23:40 +02:00
- SpigotTimings.playerListTimer.startTiming(); // Spigot
2019-06-25 03:47:58 +02:00
+ MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper
2018-12-17 06:18:06 +01:00
this.playerList.tick();
2016-04-30 03:23:40 +02:00
- SpigotTimings.playerListTimer.stopTiming(); // Spigot
2019-06-25 03:47:58 +02:00
+ MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper
2019-12-11 01:56:03 +01:00
if (SharedConstants.b) {
GameTestHarnessTicker.a.b();
}
2019-04-24 03:00:24 +02:00
this.methodProfiler.exitEnter("server gui refresh");
2018-08-26 20:11:49 +02:00
2016-04-30 03:23:40 +02:00
- SpigotTimings.tickablesTimer.startTiming(); // Spigot
2019-06-25 03:47:58 +02:00
+ MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper
for (int i = 0; i < this.tickables.size(); ++i) {
((Runnable) this.tickables.get(i)).run();
2016-04-30 03:23:40 +02:00
}
- SpigotTimings.tickablesTimer.stopTiming(); // Spigot
2019-06-25 03:47:58 +02:00
+ MinecraftTimings.tickablesTimer.stopTiming(); // Spigot // Paper
2016-04-30 03:23:40 +02:00
2018-12-17 06:18:06 +01:00
this.methodProfiler.exit();
2016-04-30 03:23:40 +02:00
}
2016-06-05 06:10:50 +02:00
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
2020-04-26 08:05:41 +02:00
index 93d838ec2d..5e31b65e16 100644
2016-06-05 06:10:50 +02:00
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
2019-06-25 03:47:58 +02:00
@@ -1,7 +1,9 @@
2016-06-05 06:10:50 +02:00
package net.minecraft.server;
2019-06-25 03:47:58 +02:00
+import co.aikar.timings.Timing; // Paper
2019-04-24 03:00:24 +02:00
import com.google.common.collect.ImmutableList;
2019-06-25 03:47:58 +02:00
import com.google.common.collect.Iterables;
+import com.google.common.collect.ComparisonChain; // Paper
2018-07-15 03:53:17 +02:00
import com.google.common.collect.Lists;
2019-05-28 01:01:45 +02:00
import com.google.common.collect.Queues;
2019-04-24 03:00:24 +02:00
import com.google.common.collect.Sets;
2020-04-26 08:05:41 +02:00
@@ -506,11 +508,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
2019-07-12 06:04:38 +02:00
private CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> f(ChunkCoordIntPair chunkcoordintpair) {
return CompletableFuture.supplyAsync(() -> {
- try {
2020-04-26 08:05:41 +02:00
+ try (Timing ignored = this.world.timings.chunkLoad.startTimingIfSync()) { // Paper
2020-01-22 03:02:07 +01:00
this.world.getMethodProfiler().c("chunkLoad");
- NBTTagCompound nbttagcompound = this.readChunkData(chunkcoordintpair);
2019-07-12 06:04:38 +02:00
+ NBTTagCompound nbttagcompound; // Paper
2020-04-26 08:05:41 +02:00
+ try (Timing ignored2 = this.world.timings.chunkIO.startTimingIfSync()) { // Paper start - timings
2020-01-22 03:02:07 +01:00
+ nbttagcompound = this.readChunkData(chunkcoordintpair);
+ } // Paper end
2019-07-12 06:04:38 +02:00
2020-04-26 08:05:41 +02:00
- if (nbttagcompound != null) {
+ if (nbttagcompound != null) {try (Timing ignored2 = this.world.timings.chunkLoadLevelTimer.startTimingIfSync()) { // Paper start - timings
2019-07-12 06:04:38 +02:00
boolean flag = nbttagcompound.hasKeyOfType("Level", 10) && nbttagcompound.getCompound("Level").hasKeyOfType("Status", 8);
2020-04-26 08:05:41 +02:00
if (flag) {
@@ -521,7 +526,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
PlayerChunkMap.LOGGER.error("Chunk file at {} is missing level data, skipping", chunkcoordintpair);
- }
+ }} // Paper
} catch (ReportedException reportedexception) {
Throwable throwable = reportedexception.getCause();
2020-01-28 01:16:53 +01:00
@@ -548,7 +553,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
2020-01-22 03:02:07 +01:00
return "chunkGenerate " + chunkstatus.d();
2019-05-28 01:01:45 +02:00
});
return completablefuture.thenComposeAsync((either) -> {
- return (CompletableFuture) either.map((list) -> {
+ return either.map((list) -> { // Paper - Shut up.
try {
CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture1 = chunkstatus.a(this.world, this.chunkGenerator, this.definedStructureManager, this.lightEngine, (ichunkaccess) -> {
return this.c(playerchunk);
2020-01-28 01:16:53 +01:00
@@ -601,6 +606,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
2019-07-12 06:04:38 +02:00
ChunkStatus chunkstatus = PlayerChunk.getChunkStatus(playerchunk.getTicketLevel());
return !chunkstatus.b(ChunkStatus.FULL) ? PlayerChunk.UNLOADED_CHUNK_ACCESS : either.mapLeft((ichunkaccess) -> {
2020-04-26 08:05:41 +02:00
+ try (Timing ignored = world.timings.chunkPostLoad.startTimingIfSync()) { // Paper
2019-07-12 06:04:38 +02:00
ChunkCoordIntPair chunkcoordintpair = playerchunk.i();
Chunk chunk;
2020-01-28 01:16:53 +01:00
@@ -652,6 +658,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
2019-07-12 06:04:38 +02:00
}
return chunk;
+ } // Paper
});
}, (runnable) -> {
Mailbox mailbox = this.mailboxMain;
2020-01-28 01:16:53 +01:00
@@ -1091,6 +1098,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
2016-06-05 06:10:50 +02:00
2019-04-24 03:00:24 +02:00
PlayerChunkMap.EntityTracker playerchunkmap_entitytracker;
ObjectIterator objectiterator;
+ world.timings.tracker1.startTiming(); // Paper
2016-06-05 06:10:50 +02:00
2019-04-24 03:00:24 +02:00
for (objectiterator = this.trackedEntities.values().iterator(); objectiterator.hasNext(); playerchunkmap_entitytracker.trackerEntry.a()) {
playerchunkmap_entitytracker = (PlayerChunkMap.EntityTracker) objectiterator.next();
2020-01-28 01:16:53 +01:00
@@ -1108,16 +1116,20 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
2019-04-24 03:00:24 +02:00
playerchunkmap_entitytracker.e = sectionposition1;
2016-06-05 06:10:50 +02:00
}
}
2019-04-24 03:00:24 +02:00
+ world.timings.tracker1.stopTiming(); // Paper
2016-06-05 06:10:50 +02:00
2019-12-11 01:56:03 +01:00
if (!list.isEmpty()) {
objectiterator = this.trackedEntities.values().iterator();
2016-06-05 06:10:50 +02:00
2019-12-11 01:56:03 +01:00
+ world.timings.tracker2.startTiming(); // Paper
while (objectiterator.hasNext()) {
playerchunkmap_entitytracker = (PlayerChunkMap.EntityTracker) objectiterator.next();
playerchunkmap_entitytracker.track(list);
}
+ world.timings.tracker2.stopTiming(); // Paper
2019-05-06 22:45:02 +02:00
}
2019-12-11 01:56:03 +01:00
+
2019-05-06 22:45:02 +02:00
}
2019-12-11 01:56:03 +01:00
protected void broadcast(Entity entity, Packet<?> packet) {
2016-01-09 07:32:38 +01:00
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2020-04-24 11:33:33 +02:00
index 6a681d694e..914366afcd 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2019-05-06 04:58:04 +02:00
@@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
2016-03-04 22:20:13 +01:00
import org.bukkit.inventory.EquipmentSlot;
2016-01-09 07:32:38 +01:00
import org.bukkit.inventory.InventoryView;
import org.bukkit.util.NumberConversions;
2016-04-30 03:23:40 +02:00
+import co.aikar.timings.MinecraftTimings; // Paper
2016-01-09 07:32:38 +01:00
// CraftBukkit end
2019-04-24 03:00:24 +02:00
public class PlayerConnection implements PacketListenerPlayIn {
2019-05-06 04:58:04 +02:00
@@ -135,7 +136,6 @@ public class PlayerConnection implements PacketListenerPlayIn {
2018-10-28 23:08:08 +01:00
// CraftBukkit end
2018-12-17 06:18:06 +01:00
public void tick() {
2018-10-28 23:08:08 +01:00
- org.bukkit.craftbukkit.SpigotTimings.playerConnectionTimer.startTiming(); // Spigot
this.syncPosition();
2019-12-11 01:56:03 +01:00
this.player.lastX = this.player.locX();
this.player.lastY = this.player.locY();
@@ -211,7 +211,6 @@ public class PlayerConnection implements PacketListenerPlayIn {
2018-10-28 23:08:08 +01:00
this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
this.disconnect(new ChatMessage("multiplayer.disconnect.idling", new Object[0]));
}
- org.bukkit.craftbukkit.SpigotTimings.playerConnectionTimer.stopTiming(); // Spigot
}
2020-02-09 01:32:48 +01:00
@@ -1639,7 +1638,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
2016-01-09 07:32:38 +01:00
// CraftBukkit end
2017-05-14 20:05:01 +02:00
private void handleCommand(String s) {
2016-01-09 07:32:38 +01:00
- org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
2017-05-14 20:05:01 +02:00
+ MinecraftTimings.playerCommandTimer.startTiming(); // Paper
2018-07-15 03:53:17 +02:00
// CraftBukkit start - whole method
2016-01-09 07:32:38 +01:00
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
2016-03-01 00:09:49 +01:00
this.LOGGER.info(this.player.getName() + " issued server command: " + s);
2020-02-09 01:32:48 +01:00
@@ -1650,7 +1649,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
2016-01-09 07:32:38 +01:00
this.server.getPluginManager().callEvent(event);
if (event.isCancelled()) {
- org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
2016-04-30 03:23:40 +02:00
+ MinecraftTimings.playerCommandTimer.stopTiming(); // Paper
2016-01-09 07:32:38 +01:00
return;
}
2020-02-09 01:32:48 +01:00
@@ -1663,7 +1662,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
2016-01-09 07:32:38 +01:00
java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
2018-07-15 03:53:17 +02:00
return;
} finally {
2016-01-09 07:32:38 +01:00
- org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
2016-04-30 03:23:40 +02:00
+ MinecraftTimings.playerCommandTimer.stopTiming(); // Paper
2016-01-09 07:32:38 +01:00
}
2018-07-15 03:53:17 +02:00
// this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
2016-01-09 07:32:38 +01:00
// CraftBukkit end
2017-02-05 06:13:16 +01:00
diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
2020-04-24 11:33:33 +02:00
index 2c671629a4..eb3269e0ea 100644
2017-02-05 06:13:16 +01:00
--- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
+++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
2019-07-20 06:01:24 +02:00
@@ -2,6 +2,8 @@ package net.minecraft.server;
2017-02-05 06:13:16 +01:00
2019-07-20 06:01:24 +02:00
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
2017-02-05 06:13:16 +01:00
+import co.aikar.timings.MinecraftTimings; // Paper
+import co.aikar.timings.Timing; // Paper
2019-07-20 06:01:24 +02:00
2017-02-05 06:13:16 +01:00
public class PlayerConnectionUtils {
2019-01-01 04:15:55 +01:00
2019-07-20 06:01:24 +02:00
@@ -13,10 +15,13 @@ public class PlayerConnectionUtils {
2019-04-24 03:00:24 +02:00
public static <T extends PacketListener> void ensureMainThread(Packet<T> packet, T t0, IAsyncTaskHandler<?> iasynctaskhandler) throws CancelledPacketHandleException {
2017-02-05 06:13:16 +01:00
if (!iasynctaskhandler.isMainThread()) {
2019-07-20 06:01:24 +02:00
+ Timing timing = MinecraftTimings.getPacketTiming(packet); // Paper - timings
2019-04-24 03:00:24 +02:00
iasynctaskhandler.execute(() -> {
2019-05-06 04:58:04 +02:00
if (MinecraftServer.getServer().hasStopped() || (t0 instanceof PlayerConnection && ((PlayerConnection) t0).processedDisconnect)) return; // CraftBukkit, MC-142590
2019-07-20 06:01:24 +02:00
if (t0.a().isConnected()) {
+ try (Timing ignored = timing.startTiming()) { // Paper - timings
packet.a(t0);
+ } // Paper - timings
} else {
PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet);
}
2016-10-21 22:42:49 +02:00
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
2020-04-24 11:33:33 +02:00
index 94ed83baf0..f28be11eee 100644
2016-10-21 22:42:49 +02:00
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1,5 +1,6 @@
package net.minecraft.server;
+import co.aikar.timings.MinecraftTimings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
2019-12-11 01:56:03 +01:00
@@ -898,10 +899,11 @@ public abstract class PlayerList {
2016-10-21 22:42:49 +02:00
}
public void savePlayers() {
+ MinecraftTimings.savePlayers.startTiming(); // Paper
for (int i = 0; i < this.players.size(); ++i) {
this.savePlayerFile((EntityPlayer) this.players.get(i));
}
-
+ MinecraftTimings.savePlayers.stopTiming(); // Paper
}
2018-07-15 03:53:17 +02:00
public WhiteList getWhitelist() {
diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
2020-04-24 11:33:33 +02:00
index 00bbd34b6a..f533860bbe 100644
2018-07-15 03:53:17 +02:00
--- a/src/main/java/net/minecraft/server/TickListServer.java
+++ b/src/main/java/net/minecraft/server/TickListServer.java
2019-05-28 01:01:45 +02:00
@@ -28,13 +28,18 @@ public class TickListServer<T> implements TickList<T> {
private final List<NextTickListEntry<T>> h = Lists.newArrayList();
private final Consumer<NextTickListEntry<T>> i;
2018-07-15 03:53:17 +02:00
- public TickListServer(WorldServer worldserver, Predicate<T> predicate, Function<T, MinecraftKey> function, Function<MinecraftKey, T> function1, Consumer<NextTickListEntry<T>> consumer) {
+ public TickListServer(WorldServer worldserver, Predicate<T> predicate, Function<T, MinecraftKey> function, Function<MinecraftKey, T> function1, Consumer<NextTickListEntry<T>> consumer, String timingsType) { // Paper
this.a = predicate;
this.b = function;
this.c = function1;
2019-05-28 01:01:45 +02:00
this.f = worldserver;
this.i = consumer;
+ this.timingCleanup = co.aikar.timings.WorldTimingsHandler.getTickList(worldserver, timingsType + " - Cleanup");
+ this.timingTicking = co.aikar.timings.WorldTimingsHandler.getTickList(worldserver, timingsType + " - Ticking");
2018-07-15 03:53:17 +02:00
}
+ private final co.aikar.timings.Timing timingCleanup; // Paper
+ private final co.aikar.timings.Timing timingTicking; // Paper
+ // Paper end
2016-08-28 02:36:26 +02:00
2019-07-20 06:01:24 +02:00
public void b() {
2019-05-28 01:01:45 +02:00
int i = this.nextTickList.size();
@@ -57,6 +62,7 @@ public class TickListServer<T> implements TickList<T> {
2016-08-28 02:36:26 +02:00
2019-05-28 01:01:45 +02:00
this.f.getMethodProfiler().enter("cleaning");
+ this.timingCleanup.startTiming(); // Paper
2019-05-14 04:20:58 +02:00
NextTickListEntry nextticklistentry;
2016-08-28 02:36:26 +02:00
2019-05-28 01:01:45 +02:00
while (i > 0 && iterator.hasNext()) {
@@ -72,7 +78,9 @@ public class TickListServer<T> implements TickList<T> {
2019-05-14 04:20:58 +02:00
--i;
}
2018-07-15 03:53:17 +02:00
}
2019-05-28 01:01:45 +02:00
+ this.timingCleanup.stopTiming(); // Paper
+ this.timingTicking.startTiming(); // Paper
this.f.getMethodProfiler().exitEnter("ticking");
2016-08-28 02:36:26 +02:00
2019-05-28 01:01:45 +02:00
while ((nextticklistentry = (NextTickListEntry) this.g.poll()) != null) {
@@ -93,6 +101,7 @@ public class TickListServer<T> implements TickList<T> {
}
2016-08-28 02:36:26 +02:00
2019-05-28 01:01:45 +02:00
this.f.getMethodProfiler().exit();
+ this.timingTicking.stopTiming(); // Paper
this.h.clear();
2018-07-15 03:53:17 +02:00
this.g.clear();
2016-08-28 02:36:26 +02:00
}
2016-01-09 07:32:38 +01:00
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
2020-04-24 11:33:33 +02:00
index 820180ab3f..fa6400dccd 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
2019-05-14 04:20:58 +02:00
@@ -9,11 +9,12 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
2019-05-06 04:58:04 +02:00
import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
import org.bukkit.inventory.InventoryHolder;
// CraftBukkit end
2016-01-09 07:32:38 +01:00
-import org.spigotmc.CustomTimingsHandler; // Spigot
2016-04-30 03:23:40 +02:00
+import co.aikar.timings.MinecraftTimings; // Paper
2016-03-01 00:09:49 +01:00
+import co.aikar.timings.Timing; // Paper
2016-01-09 07:32:38 +01:00
2018-07-27 06:44:53 +02:00
public abstract class TileEntity implements KeyedObject { // Paper
2016-01-09 07:32:38 +01:00
- public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot
2016-04-30 03:23:40 +02:00
+ public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper
2019-05-06 04:58:04 +02:00
// CraftBukkit start - data containers
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
2019-07-05 04:13:38 +02:00
public CraftPersistentDataContainer persistentDataContainer;
2016-01-09 07:32:38 +01:00
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
2020-04-24 11:33:33 +02:00
index 2a4fa455ff..f572c5f227 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2019-04-24 03:00:24 +02:00
@@ -1,5 +1,7 @@
package net.minecraft.server;
2018-07-15 03:53:17 +02:00
2019-04-24 03:00:24 +02:00
+import co.aikar.timings.Timing;
2018-07-15 03:53:17 +02:00
+import co.aikar.timings.Timings;
import com.google.common.collect.Lists;
2019-04-24 03:00:24 +02:00
import java.io.IOException;
import java.util.Collection;
2020-01-28 20:43:57 +01:00
@@ -18,7 +20,7 @@ import org.apache.logging.log4j.util.Supplier;
import java.util.HashMap;
2016-03-01 00:09:49 +01:00
import java.util.Map;
import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.SpigotTimings; // Spigot
2020-01-28 20:43:57 +01:00
+import org.bukkit.block.BlockState;
2016-01-09 07:32:38 +01:00
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.CraftWorld;
2020-01-28 20:43:57 +01:00
import org.bukkit.craftbukkit.block.CapturedBlockState;
2020-03-10 12:01:15 +01:00
@@ -73,7 +75,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
2016-01-09 07:32:38 +01:00
2016-03-01 00:09:49 +01:00
public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
2016-01-09 07:32:38 +01:00
- public final SpigotTimings.WorldTimingsHandler timings; // Spigot
2016-03-01 00:09:49 +01:00
+ public final co.aikar.timings.WorldTimingsHandler timings; // Paper
2019-02-03 16:34:04 +01:00
public static BlockPosition lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
2019-04-24 03:00:24 +02:00
private org.spigotmc.TickLimiter tileLimiter;
2020-03-10 12:01:15 +01:00
@@ -138,7 +140,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
2019-04-24 03:00:24 +02:00
public void c(WorldBorder worldborder, double d0) {}
2016-03-25 05:59:37 +01:00
});
2016-03-03 10:46:26 +01:00
// CraftBukkit end
2016-03-01 00:09:49 +01:00
- timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot - code below can generate new world and access timings
+ timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings
2019-04-24 03:00:24 +02:00
this.entityLimiter = new org.spigotmc.TickLimiter(spigotConfig.entityMaxTickTime);
2016-01-09 07:32:38 +01:00
this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
}
2020-04-08 09:49:15 +02:00
@@ -722,15 +724,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
2016-01-09 07:32:38 +01:00
}
timings.tileEntityPending.stopTiming(); // Spigot
2016-03-01 00:09:49 +01:00
+ co.aikar.timings.TimingHistory.tileEntityTicks += this.tileEntityListTick.size(); // Paper
2019-04-24 03:00:24 +02:00
gameprofilerfiller.exit();
spigotConfig.currentPrimedTnt = 0; // Spigot
2016-01-09 07:32:38 +01:00
}
2018-04-22 16:40:36 +02:00
2019-04-24 03:00:24 +02:00
public void a(Consumer<Entity> consumer, Entity entity) {
try {
2019-05-14 04:20:58 +02:00
- SpigotTimings.tickEntityTimer.startTiming(); // Spigot
2019-04-24 03:00:24 +02:00
consumer.accept(entity);
2019-05-14 04:20:58 +02:00
- SpigotTimings.tickEntityTimer.stopTiming(); // Spigot
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked");
2016-01-09 07:32:38 +01:00
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
2020-04-24 11:33:33 +02:00
index 8a5ac6f69b..6810d49b17 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
2019-12-11 01:56:03 +01:00
@@ -1,6 +1,8 @@
2018-07-15 03:53:17 +02:00
package net.minecraft.server;
2019-12-11 01:56:03 +01:00
import com.google.common.annotations.VisibleForTesting;
+import co.aikar.timings.TimingHistory; // Paper
+import co.aikar.timings.Timings; // Paper
2018-07-15 03:53:17 +02:00
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
2019-04-24 03:00:24 +02:00
import com.google.common.collect.Queues;
2019-12-11 01:56:03 +01:00
@@ -40,7 +42,6 @@ import org.apache.logging.log4j.Logger;
2019-10-18 18:31:01 +02:00
import java.util.logging.Level;
2019-05-14 04:20:58 +02:00
import org.bukkit.Bukkit;
2019-04-24 03:00:24 +02:00
import org.bukkit.WeatherType;
-import org.bukkit.craftbukkit.SpigotTimings; // Spigot
import org.bukkit.craftbukkit.event.CraftEventFactory;
2019-05-14 04:20:58 +02:00
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.server.MapInitializeEvent;
2019-12-23 03:37:47 +01:00
@@ -97,10 +98,10 @@ public class WorldServer extends World {
2019-01-01 04:15:55 +01:00
// CraftBukkit end
this.nextTickListBlock = new TickListServer<>(this, (block) -> {
return block == null || block.getBlockData().isAir();
2019-04-24 03:00:24 +02:00
- }, IRegistry.BLOCK::getKey, IRegistry.BLOCK::get, this::b);
+ }, IRegistry.BLOCK::getKey, IRegistry.BLOCK::get, this::b, "Blocks"); // Paper - Timings
2019-01-01 04:15:55 +01:00
this.nextTickListFluid = new TickListServer<>(this, (fluidtype) -> {
return fluidtype == null || fluidtype == FluidTypes.EMPTY;
2019-12-12 04:06:23 +01:00
- }, IRegistry.FLUID::getKey, IRegistry.FLUID::get, this::a);
2019-04-24 03:00:24 +02:00
+ }, IRegistry.FLUID::getKey, IRegistry.FLUID::get, this::a, "Fluids"); // Paper - Timings
2019-12-12 04:06:23 +01:00
this.navigators = Sets.newHashSet();
2019-07-20 06:01:24 +02:00
this.I = new ObjectLinkedOpenHashSet();
this.dataManager = worldnbtstorage;
2019-12-23 03:37:47 +01:00
@@ -305,20 +306,24 @@ public class WorldServer extends World {
2019-12-11 01:56:03 +01:00
this.N();
2019-07-24 05:20:14 +02:00
this.a();
2019-05-06 09:20:16 +02:00
gameprofilerfiller.exitEnter("chunkSource");
2019-07-24 05:20:14 +02:00
+ this.timings.chunkProviderTick.startTiming(); // Paper - timings
2019-05-06 09:20:16 +02:00
this.getChunkProvider().tick(booleansupplier);
2019-07-24 05:20:14 +02:00
+ this.timings.chunkProviderTick.stopTiming(); // Paper - timings
2019-05-06 09:20:16 +02:00
gameprofilerfiller.exitEnter("tickPending");
- timings.doTickPending.startTiming(); // Spigot
+ timings.scheduledBlocks.startTiming(); // Spigot
if (this.worldData.getType() != WorldType.DEBUG_ALL_BLOCK_STATES) {
2019-07-20 06:01:24 +02:00
this.nextTickListBlock.b();
this.nextTickListFluid.b();
2019-05-06 09:20:16 +02:00
}
- timings.doTickPending.stopTiming(); // Spigot
+ timings.scheduledBlocks.stopTiming(); // Spigot
2019-07-24 05:20:14 +02:00
gameprofilerfiller.exitEnter("raid");
+ this.timings.raids.startTiming(); // Paper - timings
2019-12-12 04:06:23 +01:00
this.persistentRaid.a();
2019-07-24 05:20:14 +02:00
if (this.mobSpawnerTrader != null) {
this.mobSpawnerTrader.a();
}
+ this.timings.raids.stopTiming(); // Paper - timings
gameprofilerfiller.exitEnter("blockEvents");
timings.doSounds.startTiming(); // Spigot
2019-12-23 03:37:47 +01:00
@@ -361,6 +366,7 @@ public class WorldServer extends World {
2019-04-24 03:00:24 +02:00
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
timings.entityTick.startTiming(); // Spigot
+ TimingHistory.entityTicks += this.globalEntityList.size(); // Paper
while (objectiterator.hasNext()) {
Entry<Entity> entry = (Entry) objectiterator.next();
Entity entity1 = (Entity) entry.getValue();
2020-03-19 07:03:32 +01:00
@@ -409,9 +415,11 @@ public class WorldServer extends World {
2019-07-24 05:20:14 +02:00
this.tickingEntities = false;
+ try (co.aikar.timings.Timing ignored = this.timings.newEntities.startTiming()) { // Paper - timings
while ((entity = (Entity) this.entitiesToAdd.poll()) != null) {
this.registerEntity(entity);
}
+ } // Paper - timings
gameprofilerfiller.exit();
timings.tickEntities.stopTiming(); // Spigot
2020-03-19 07:03:32 +01:00
@@ -476,6 +484,7 @@ public class WorldServer extends World {
2019-04-24 03:00:24 +02:00
}
2016-01-09 07:32:38 +01:00
2019-04-24 03:00:24 +02:00
gameprofilerfiller.exitEnter("tickBlocks");
+ timings.chunkTicksBlocks.startTiming(); // Paper
if (i > 0) {
ChunkSection[] achunksection = chunk.getSections();
int l = achunksection.length;
2020-03-19 07:03:32 +01:00
@@ -507,7 +516,7 @@ public class WorldServer extends World {
2016-01-09 07:32:38 +01:00
}
}
2019-04-24 03:00:24 +02:00
}
-
+ timings.chunkTicksBlocks.stopTiming(); // Paper
gameprofilerfiller.exit();
}
2016-01-09 07:32:38 +01:00
2020-03-19 07:03:32 +01:00
@@ -603,6 +612,7 @@ public class WorldServer extends World {
public void entityJoinedWorld(Entity entity) {
if (entity instanceof EntityHuman || this.getChunkProvider().a(entity)) {
+ ++TimingHistory.entityTicks; // Paper - timings
// Spigot start
if (!org.spigotmc.ActivationRange.checkIfActive(entity)) {
entity.ticksLived++;
@@ -611,7 +621,9 @@ public class WorldServer extends World {
}
// Spigot end
+ TimingHistory.activatedEntityTicks++; // Paper - timings
entity.tickTimer.startTiming(); // Spigot
+ try { // Paper - timings
entity.f(entity.locX(), entity.locY(), entity.locZ());
entity.lastYaw = entity.yaw;
entity.lastPitch = entity.pitch;
@@ -638,7 +650,9 @@ public class WorldServer extends World {
this.a(entity, entity1);
}
}
+ } finally { // Paper - timings
entity.tickTimer.stopTiming(); // Spigot
+ } // Paper - timings
}
}
@@ -799,6 +813,7 @@ public class WorldServer extends World {
2016-10-21 22:42:49 +02:00
2019-04-24 03:00:24 +02:00
if (!flag1) {
2016-10-21 22:42:49 +02:00
org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
2019-05-06 09:20:16 +02:00
+ try (co.aikar.timings.Timing ignored = timings.worldSave.startTiming()) { // Paper
2016-10-21 22:42:49 +02:00
if (iprogressupdate != null) {
2018-07-15 03:53:17 +02:00
iprogressupdate.a(new ChatMessage("menu.savingLevel", new Object[0]));
2016-10-21 22:42:49 +02:00
}
2020-03-19 07:03:32 +01:00
@@ -808,7 +823,10 @@ public class WorldServer extends World {
2018-07-15 03:53:17 +02:00
iprogressupdate.c(new ChatMessage("menu.savingChunks", new Object[0]));
2016-10-21 22:42:49 +02:00
}
+ timings.worldSaveChunks.startTiming(); // Paper
2019-04-24 03:00:24 +02:00
chunkproviderserver.save(flag);
2016-10-21 22:42:49 +02:00
+ timings.worldSaveChunks.stopTiming(); // Paper
2019-04-24 03:00:24 +02:00
+ } // Paper
2016-10-21 22:42:49 +02:00
}
2019-06-25 15:55:44 +02:00
// CraftBukkit start - moved from MinecraftServer.saveChunks
2016-01-09 07:32:38 +01:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2020-04-27 09:34:45 +02:00
index ad1dcf5304..1ceba5f7ea 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2020-03-10 12:01:15 +01:00
@@ -1973,12 +1973,31 @@ public final class CraftServer implements Server {
2016-03-01 00:09:49 +01:00
private final Spigot spigot = new Spigot()
{
2016-01-09 07:32:38 +01:00
+ @Deprecated
@Override
public YamlConfiguration getConfig()
{
2018-03-10 14:07:40 +01:00
return org.spigotmc.SpigotConfig.config;
2016-03-01 00:09:49 +01:00
}
2018-03-10 14:07:40 +01:00
+ @Override
2016-01-09 07:32:38 +01:00
+ public YamlConfiguration getBukkitConfig()
+ {
+ return configuration;
+ }
+
+ @Override
+ public YamlConfiguration getSpigotConfig()
+ {
2016-03-01 00:09:49 +01:00
+ return org.spigotmc.SpigotConfig.config;
+ }
+
+ @Override
+ public YamlConfiguration getPaperConfig()
2016-01-09 07:32:38 +01:00
+ {
2016-03-01 00:09:49 +01:00
+ return com.destroystokyo.paper.PaperConfig.config;
2016-01-09 07:32:38 +01:00
+ }
+
2018-03-10 14:07:40 +01:00
@Override
2016-01-09 07:32:38 +01:00
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
deleted file mode 100644
2020-04-24 11:33:33 +02:00
index 2bd22a3698..0000000000
2016-01-09 07:32:38 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
+++ /dev/null
2019-12-11 01:56:03 +01:00
@@ -1,162 +0,0 @@
2016-01-09 07:32:38 +01:00
-package org.bukkit.craftbukkit;
-
-import java.util.HashMap;
2019-04-24 03:00:24 +02:00
-import net.minecraft.server.Entity;
-import net.minecraft.server.TileEntity;
-import net.minecraft.server.World;
2016-01-09 07:32:38 +01:00
-import org.bukkit.craftbukkit.scheduler.CraftTask;
2019-04-24 03:00:24 +02:00
-import org.bukkit.plugin.java.JavaPluginLoader;
-import org.bukkit.scheduler.BukkitTask;
-import org.spigotmc.CustomTimingsHandler;
2016-01-09 07:32:38 +01:00
-
-public class SpigotTimings {
-
- public static final CustomTimingsHandler serverTickTimer = new CustomTimingsHandler("** Full Server Tick");
- public static final CustomTimingsHandler playerListTimer = new CustomTimingsHandler("Player List");
2017-05-14 20:05:01 +02:00
- public static final CustomTimingsHandler commandFunctionsTimer = new CustomTimingsHandler("Command Functions");
2016-01-09 07:32:38 +01:00
- public static final CustomTimingsHandler connectionTimer = new CustomTimingsHandler("Connection Handler");
2018-10-28 23:08:08 +01:00
- public static final CustomTimingsHandler playerConnectionTimer = new CustomTimingsHandler("** PlayerConnection");
2016-01-09 07:32:38 +01:00
- public static final CustomTimingsHandler tickablesTimer = new CustomTimingsHandler("Tickables");
- public static final CustomTimingsHandler schedulerTimer = new CustomTimingsHandler("Scheduler");
- public static final CustomTimingsHandler timeUpdateTimer = new CustomTimingsHandler("Time Update");
- public static final CustomTimingsHandler serverCommandTimer = new CustomTimingsHandler("Server Command");
- public static final CustomTimingsHandler worldSaveTimer = new CustomTimingsHandler("World Save");
-
- public static final CustomTimingsHandler entityMoveTimer = new CustomTimingsHandler("** entityMove");
- public static final CustomTimingsHandler tickEntityTimer = new CustomTimingsHandler("** tickEntity");
- public static final CustomTimingsHandler activatedEntityTimer = new CustomTimingsHandler("** activatedTickEntity");
- public static final CustomTimingsHandler tickTileEntityTimer = new CustomTimingsHandler("** tickTileEntity");
-
- public static final CustomTimingsHandler timerEntityBaseTick = new CustomTimingsHandler("** livingEntityBaseTick");
- public static final CustomTimingsHandler timerEntityAI = new CustomTimingsHandler("** livingEntityAI");
- public static final CustomTimingsHandler timerEntityAICollision = new CustomTimingsHandler("** livingEntityAICollision");
- public static final CustomTimingsHandler timerEntityAIMove = new CustomTimingsHandler("** livingEntityAIMove");
- public static final CustomTimingsHandler timerEntityTickRest = new CustomTimingsHandler("** livingEntityTickRest");
-
- public static final CustomTimingsHandler processQueueTimer = new CustomTimingsHandler("processQueue");
- public static final CustomTimingsHandler schedulerSyncTimer = new CustomTimingsHandler("** Scheduler - Sync Tasks", JavaPluginLoader.pluginParentTimer);
-
- public static final CustomTimingsHandler playerCommandTimer = new CustomTimingsHandler("** playerCommand");
-
- public static final CustomTimingsHandler entityActivationCheckTimer = new CustomTimingsHandler("entityActivationCheck");
- public static final CustomTimingsHandler checkIfActiveTimer = new CustomTimingsHandler("** checkIfActive");
-
- public static final HashMap<String, CustomTimingsHandler> entityTypeTimingMap = new HashMap<String, CustomTimingsHandler>();
- public static final HashMap<String, CustomTimingsHandler> tileEntityTypeTimingMap = new HashMap<String, CustomTimingsHandler>();
- public static final HashMap<String, CustomTimingsHandler> pluginTaskTimingMap = new HashMap<String, CustomTimingsHandler>();
-
- /**
- * Gets a timer associated with a plugins tasks.
- * @param task
- * @param period
- * @return
- */
- public static CustomTimingsHandler getPluginTaskTimings(BukkitTask task, long period) {
- if (!task.isSync()) {
- return null;
- }
- String plugin;
- final CraftTask ctask = (CraftTask) task;
-
- if (task.getOwner() != null) {
- plugin = task.getOwner().getDescription().getFullName();
- } else {
- plugin = "Unknown";
- }
- String taskname = ctask.getTaskName();
-
- String name = "Task: " + plugin + " Runnable: " + taskname;
- if (period > 0) {
- name += "(interval:" + period +")";
- } else {
- name += "(Single)";
- }
- CustomTimingsHandler result = pluginTaskTimingMap.get(name);
- if (result == null) {
- result = new CustomTimingsHandler(name, SpigotTimings.schedulerSyncTimer);
- pluginTaskTimingMap.put(name, result);
- }
- return result;
- }
-
- /**
- * Get a named timer for the specified entity type to track type specific timings.
- * @param entity
- * @return
- */
- public static CustomTimingsHandler getEntityTimings(Entity entity) {
2017-10-29 16:19:21 +01:00
- String entityType = entity.getClass().getName();
2016-01-09 07:32:38 +01:00
- CustomTimingsHandler result = entityTypeTimingMap.get(entityType);
- if (result == null) {
2017-10-29 16:19:21 +01:00
- result = new CustomTimingsHandler("** tickEntity - " + entity.getClass().getSimpleName(), activatedEntityTimer);
2016-01-09 07:32:38 +01:00
- entityTypeTimingMap.put(entityType, result);
- }
- return result;
- }
-
- /**
- * Get a named timer for the specified tile entity type to track type specific timings.
- * @param entity
- * @return
- */
- public static CustomTimingsHandler getTileEntityTimings(TileEntity entity) {
2017-10-29 16:19:21 +01:00
- String entityType = entity.getClass().getName();
2016-01-09 07:32:38 +01:00
- CustomTimingsHandler result = tileEntityTypeTimingMap.get(entityType);
- if (result == null) {
2017-10-29 16:19:21 +01:00
- result = new CustomTimingsHandler("** tickTileEntity - " + entity.getClass().getSimpleName(), tickTileEntityTimer);
2016-01-09 07:32:38 +01:00
- tileEntityTypeTimingMap.put(entityType, result);
- }
- return result;
- }
-
- /**
- * Set of timers per world, to track world specific timings.
- */
- public static class WorldTimingsHandler {
- public final CustomTimingsHandler mobSpawn;
- public final CustomTimingsHandler doChunkUnload;
- public final CustomTimingsHandler doTickPending;
- public final CustomTimingsHandler doTickTiles;
- public final CustomTimingsHandler doChunkMap;
- public final CustomTimingsHandler doSounds;
- public final CustomTimingsHandler entityTick;
- public final CustomTimingsHandler tileEntityTick;
- public final CustomTimingsHandler tileEntityPending;
- public final CustomTimingsHandler tracker;
- public final CustomTimingsHandler doTick;
- public final CustomTimingsHandler tickEntities;
-
- public final CustomTimingsHandler syncChunkLoadTimer;
- public final CustomTimingsHandler syncChunkLoadStructuresTimer;
- public final CustomTimingsHandler syncChunkLoadEntitiesTimer;
- public final CustomTimingsHandler syncChunkLoadTileEntitiesTimer;
- public final CustomTimingsHandler syncChunkLoadTileTicksTimer;
- public final CustomTimingsHandler syncChunkLoadPostTimer;
-
- public WorldTimingsHandler(World server) {
- String name = server.worldData.getName() +" - ";
-
- mobSpawn = new CustomTimingsHandler("** " + name + "mobSpawn");
- doChunkUnload = new CustomTimingsHandler("** " + name + "doChunkUnload");
- doTickPending = new CustomTimingsHandler("** " + name + "doTickPending");
- doTickTiles = new CustomTimingsHandler("** " + name + "doTickTiles");
- doChunkMap = new CustomTimingsHandler("** " + name + "doChunkMap");
- doSounds = new CustomTimingsHandler("** " + name + "doSounds");
- entityTick = new CustomTimingsHandler("** " + name + "entityTick");
- tileEntityTick = new CustomTimingsHandler("** " + name + "tileEntityTick");
- tileEntityPending = new CustomTimingsHandler("** " + name + "tileEntityPending");
-
- syncChunkLoadTimer = new CustomTimingsHandler("** " + name + "syncChunkLoad");
- syncChunkLoadStructuresTimer = new CustomTimingsHandler("** " + name + "chunkLoad - Structures");
- syncChunkLoadEntitiesTimer = new CustomTimingsHandler("** " + name + "chunkLoad - Entities");
- syncChunkLoadTileEntitiesTimer = new CustomTimingsHandler("** " + name + "chunkLoad - TileEntities");
- syncChunkLoadTileTicksTimer = new CustomTimingsHandler("** " + name + "chunkLoad - TileTicks");
- syncChunkLoadPostTimer = new CustomTimingsHandler("** " + name + "chunkLoad - Post");
-
-
- tracker = new CustomTimingsHandler(name + "tracker");
- doTick = new CustomTimingsHandler(name + "doTick");
- tickEntities = new CustomTimingsHandler(name + "tickEntities");
- }
- }
-}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2020-04-27 09:34:45 +02:00
index f20f72c035..ba6a924a9c 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
2020-04-08 09:49:15 +02:00
@@ -1718,6 +1718,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
2016-03-01 00:09:49 +01:00
packet.components = components;
getHandle().playerConnection.sendPacket(packet);
2016-01-09 07:32:38 +01:00
}
+
2018-09-29 01:31:59 +02:00
+ // Paper start
2016-01-09 07:32:38 +01:00
+ @Override
+ public int getPing()
+ {
+ return getHandle().ping;
+ }
2018-09-29 01:31:59 +02:00
+ // Paper end
2016-01-09 07:32:38 +01:00
};
public Player.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
2020-04-27 09:34:45 +02:00
index 9ad17c560c..db433ed370 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
2019-04-24 03:00:24 +02:00
@@ -1,5 +1,6 @@
package org.bukkit.craftbukkit.scheduler;
2017-02-05 06:13:16 +01:00
+import co.aikar.timings.MinecraftTimings; // Paper
2019-04-24 03:00:24 +02:00
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import java.util.ArrayList;
import java.util.Comparator;
2020-04-27 09:34:45 +02:00
@@ -254,7 +255,7 @@ public class CraftScheduler implements BukkitScheduler {
2016-01-09 07:32:38 +01:00
}
return false;
2020-04-27 09:34:45 +02:00
}
- });
+ }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer();}}; // Paper
2018-03-31 11:34:25 +02:00
handle(task, 0L);
2016-01-09 07:32:38 +01:00
for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) {
2020-04-27 09:34:45 +02:00
@@ -289,7 +290,7 @@ public class CraftScheduler implements BukkitScheduler {
2016-01-09 07:32:38 +01:00
}
}
}
- });
2016-04-30 03:23:40 +02:00
+ }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer(plugin);}}; // Paper
2018-03-31 11:34:25 +02:00
handle(task, 0L);
2016-01-09 07:32:38 +01:00
for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) {
2020-04-27 09:34:45 +02:00
@@ -396,9 +397,7 @@ public class CraftScheduler implements BukkitScheduler {
2016-01-09 07:32:38 +01:00
if (task.isSync()) {
2018-06-21 05:29:33 +02:00
currentTask = task;
2016-01-09 07:32:38 +01:00
try {
- task.timings.startTiming(); // Spigot
task.run();
- task.timings.stopTiming(); // Spigot
} catch (final Throwable throwable) {
task.getOwner().getLogger().log(
Level.WARNING,
2020-04-27 09:34:45 +02:00
@@ -425,8 +424,10 @@ public class CraftScheduler implements BukkitScheduler {
2017-02-05 06:13:16 +01:00
runners.remove(task.getTaskId());
}
}
+ MinecraftTimings.bukkitSchedulerFinishTimer.startTiming();
pending.addAll(temp);
temp.clear();
+ MinecraftTimings.bukkitSchedulerFinishTimer.stopTiming();
debugHead = debugHead.getNextHead(currentTick);
}
2020-04-27 09:34:45 +02:00
@@ -459,6 +460,7 @@ public class CraftScheduler implements BukkitScheduler {
2017-02-05 06:13:16 +01:00
}
private void parsePending() {
+ MinecraftTimings.bukkitSchedulerPendingTimer.startTiming();
CraftTask head = this.head;
CraftTask task = head.getNext();
CraftTask lastTask = head;
2020-04-27 09:34:45 +02:00
@@ -477,6 +479,7 @@ public class CraftScheduler implements BukkitScheduler {
task.setNext(null);
2017-02-05 06:13:16 +01:00
}
this.head = lastTask;
+ MinecraftTimings.bukkitSchedulerPendingTimer.stopTiming();
}
private boolean isReady(final int currentTick) {
2016-01-09 07:32:38 +01:00
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
2020-04-24 11:33:33 +02:00
index 3f55381c15..0d9a466809 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
2019-03-26 06:31:59 +01:00
@@ -1,9 +1,11 @@
package org.bukkit.craftbukkit.scheduler;
2016-01-09 07:32:38 +01:00
2018-11-24 06:28:04 +01:00
import java.util.function.Consumer;
2019-03-26 06:31:59 +01:00
+
+import co.aikar.timings.NullTimingHandler;
2016-01-09 07:32:38 +01:00
import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.SpigotTimings; // Spigot
-import org.spigotmc.CustomTimingsHandler; // Spigot
2016-04-30 03:23:40 +02:00
+import co.aikar.timings.MinecraftTimings; // Paper
2016-03-01 00:09:49 +01:00
+import co.aikar.timings.Timing; // Paper
2016-01-09 07:32:38 +01:00
import org.bukkit.plugin.Plugin;
import org.bukkit.scheduler.BukkitTask;
2019-03-26 06:31:59 +01:00
@@ -26,12 +28,12 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
2016-01-09 07:32:38 +01:00
*/
private volatile long period;
private long nextRun;
2018-11-24 06:28:04 +01:00
- private final Runnable rTask;
- private final Consumer<BukkitTask> cTask;
+ public final Runnable rTask; // Paper
+ public final Consumer<BukkitTask> cTask; // Paper
2016-03-01 00:09:49 +01:00
+ public Timing timings; // Paper
2016-01-09 07:32:38 +01:00
private final Plugin plugin;
private final int id;
- final CustomTimingsHandler timings; // Spigot
CraftTask() {
2018-03-31 11:34:25 +02:00
this(null, null, CraftTask.NO_REPEATING, CraftTask.NO_REPEATING);
2016-01-09 07:32:38 +01:00
}
2019-03-26 06:31:59 +01:00
@@ -40,7 +42,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
2018-03-31 11:34:25 +02:00
this(null, task, CraftTask.NO_REPEATING, CraftTask.NO_REPEATING);
2016-01-09 07:32:38 +01:00
}
2018-11-24 06:28:04 +01:00
- CraftTask(final Plugin plugin, final Object task, final int id, final long period) {
+ CraftTask(final Plugin plugin, final Object task, final int id, final long period) { // Paper
2016-01-09 07:32:38 +01:00
this.plugin = plugin;
2018-11-24 06:28:04 +01:00
if (task instanceof Runnable) {
this.rTask = (Runnable) task;
2019-03-26 06:31:59 +01:00
@@ -57,7 +59,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
2018-11-24 06:28:04 +01:00
}
2016-01-09 07:32:38 +01:00
this.id = id;
this.period = period;
2018-11-24 06:28:04 +01:00
- this.timings = this.isSync() ? SpigotTimings.getPluginTaskTimings(this, period) : null; // Spigot
2019-03-26 06:31:59 +01:00
+ timings = task != null ? MinecraftTimings.getPluginTaskTimings(this, period) : NullTimingHandler.NULL; // Paper
2016-01-09 07:32:38 +01:00
}
2018-11-24 06:28:04 +01:00
@Override
2019-03-26 06:31:59 +01:00
@@ -77,11 +79,13 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
2016-01-09 07:32:38 +01:00
2018-11-24 06:28:04 +01:00
@Override
2016-01-09 07:32:38 +01:00
public void run() {
2019-03-26 05:31:34 +01:00
+ try (Timing ignored = timings.startTiming()) { // Paper
2018-11-24 06:28:04 +01:00
if (rTask != null) {
rTask.run();
} else {
cTask.accept(this);
}
2019-03-26 05:31:34 +01:00
+ } // Paper
2016-01-09 07:32:38 +01:00
}
long getPeriod() {
2019-03-26 06:31:59 +01:00
@@ -108,7 +112,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
2018-11-24 06:28:04 +01:00
this.next = next;
}
- Class<?> getTaskClass() {
+ public Class<?> getTaskClass() {
return (rTask != null) ? rTask.getClass() : ((cTask != null) ? cTask.getClass() : null);
}
2019-03-26 06:31:59 +01:00
@@ -132,9 +136,4 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
2016-01-09 07:32:38 +01:00
return true;
}
2018-11-24 06:28:04 +01:00
2016-01-09 07:32:38 +01:00
- // Spigot start
- public String getTaskName() {
2018-11-24 06:28:04 +01:00
- return (getTaskClass() == null) ? "Unknown" : getTaskClass().getName();
2016-01-09 07:32:38 +01:00
- }
- // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
2020-04-24 11:33:33 +02:00
index e52ef47b78..3d90b34268 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
@@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
public class CraftIconCache implements CachedServerIcon {
public final String value;
2016-03-01 00:09:49 +01:00
+ public String getData() { return value; } // Paper
2016-01-09 07:32:38 +01:00
public CraftIconCache(final String value) {
this.value = value;
}
2019-05-06 09:20:16 +02:00
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
2020-04-24 11:33:33 +02:00
index 68728b4d86..02f3300533 100644
2019-05-06 09:20:16 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
2020-02-01 16:20:54 +01:00
@@ -298,6 +298,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
2019-05-06 09:20:16 +02:00
return clazz;
}
+ // Paper start
+ @Override
+ public String getTimingsServerName() {
+ return com.destroystokyo.paper.PaperConfig.timingsServerName;
+ }
+ // Paper end
+
/**
* This helper class represents the different NBT Tags.
* <p>
2016-01-09 07:32:38 +01:00
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
2020-04-24 11:33:33 +02:00
index ca7789b5e0..4423839697 100644
2016-01-09 07:32:38 +01:00
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
2019-05-31 01:54:25 +02:00
@@ -31,7 +31,7 @@ import net.minecraft.server.EntityWither;
2016-03-25 05:59:37 +01:00
import net.minecraft.server.MathHelper;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.World;
2016-01-09 07:32:38 +01:00
-import org.bukkit.craftbukkit.SpigotTimings;
2016-04-30 03:23:40 +02:00
+import co.aikar.timings.MinecraftTimings;
2016-01-09 07:32:38 +01:00
public class ActivationRange
{
2019-05-31 01:54:25 +02:00
@@ -75,8 +75,8 @@ public class ActivationRange
2016-04-30 03:23:40 +02:00
/**
* These entities are excluded from Activation range checks.
*
- * @param entity
2019-05-31 01:54:25 +02:00
- * @param config
2016-04-30 03:23:40 +02:00
+ * @param entity Entity to initialize
+ * @param config Spigot config to determine ranges
* @return boolean If it should always tick.
*/
public static boolean initializeEntityActivationState(Entity entity, SpigotWorldConfig config)
2019-05-31 01:54:25 +02:00
@@ -111,7 +111,7 @@ public class ActivationRange
2016-04-30 03:23:40 +02:00
*/
public static void activateEntities(World world)
{
- SpigotTimings.entityActivationCheckTimer.startTiming();
+ MinecraftTimings.entityActivationCheckTimer.startTiming();
final int miscActivationRange = world.spigotConfig.miscActivationRange;
2019-05-31 01:54:25 +02:00
final int raiderActivationRange = world.spigotConfig.raiderActivationRange;
2016-04-30 03:23:40 +02:00
final int animalActivationRange = world.spigotConfig.animalActivationRange;
2019-05-31 01:54:25 +02:00
@@ -148,7 +148,7 @@ public class ActivationRange
2016-04-30 03:23:40 +02:00
}
}
}
- SpigotTimings.entityActivationCheckTimer.stopTiming();
+ MinecraftTimings.entityActivationCheckTimer.stopTiming();
}
/**
2019-05-31 01:54:25 +02:00
@@ -245,10 +245,8 @@ public class ActivationRange
2016-03-18 22:11:53 +01:00
*/
public static boolean checkIfActive(Entity entity)
{
- SpigotTimings.checkIfActiveTimer.startTiming();
// Never safe to skip fireworks or entities not yet added to chunk
2018-07-15 03:53:17 +02:00
if ( !entity.inChunk || entity instanceof EntityFireworks ) {
2016-03-18 22:11:53 +01:00
- SpigotTimings.checkIfActiveTimer.stopTiming();
return true;
}
2019-05-31 01:54:25 +02:00
@@ -272,7 +270,6 @@ public class ActivationRange
2016-03-18 22:11:53 +01:00
{
isActive = false;
}
- SpigotTimings.checkIfActiveTimer.stopTiming();
return isActive;
}
}
2016-01-09 07:32:38 +01:00
--
Improve mid tick chunk loading, Fix Oversleep, other improvements
Process loads outside of any canSleep check. Original intent was to
only apply those restrictions to generations but realized I had some
checks higher up the call chain.
Reworked the back off strategy to just run every 1 millisecond per world,
and to apply the per tick limit to generations only.
This guarantees that your chunk will load with at most around 1ms delay.
Additionally, fire midTick processing in a few more places, notably the
oversleep section so we can keep processing loads here too which has
a large up to 50ms window...
Speaking of oversleep, we had a bug in our implementation changes for
Timings that caused oversleep to not sleep the correct amount.
Because we now moved it into the NEXT tick instead of THIS tick, the
value of nextTick had already been increased to +50ms, resulting in
the risk of sleeping more than it should, but, more importantly, this
caused every task that was trying to NOT run during oversleep to actually
run during oversleep.
This is now fixed.
Another small tweak is to the /tps command, to no longer show the star when
TPS is right at 20.
Due to ineffeciencies in the sleep precision, TPS is commonly 20.02.
This causes the star to show up almost constantly, so now only show it if
we actually hit a real "catchup".
This commit also improves the changes to the CallbackExecutor, in that
it now is also recursion safe.
It was possible that the executor could run tasks out of desired order
if the executor task scheduled more executor tasks.
We solve this by ensuring new additions do not enter the currently iterated queue.
Each depth level will have its own queue.
Fixes #3220
2020-04-26 05:47:29 +02:00
2.26.2
2016-01-09 07:32:38 +01:00
