core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more timings to Scheduler and other improvements

This commit is contained in:
Aikar 2017-02-05 00:13:16 -05:00
parent ee7f13ea3c
commit d49de13c00
2 changed files with 91 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
Spigot-Server-Patches/0005-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From f6a0b22a39ad826143911fdb4e4127297e1cf862 Mon Sep 17 00:00:00 2001 From 8e2978c9da9da635806aab35b1f33c44c7999312 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600 Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2 Subject: [PATCH] Timings v2
@ -23,10 +23,10 @@ index 8b96966d8..8d1e8680b 100644
<version>3.0.3</version> <version>3.0.3</version>
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
new file mode 100644 new file mode 100644
index 000000000..29838de47 index 000000000..4b4b77a5c
--- /dev/null --- /dev/null
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -0,0 +1,114 @@ @@ -0,0 +1,124 @@
+package co.aikar.timings; +package co.aikar.timings;
+ +
+import net.minecraft.server.*; +import net.minecraft.server.*;
@ -42,6 +42,8 @@ index 000000000..29838de47
+ public static final Timing tickablesTimer = Timings.ofSafe("Tickables"); + public static final Timing tickablesTimer = Timings.ofSafe("Tickables");
+ public static final Timing minecraftSchedulerTimer = Timings.ofSafe("Minecraft Scheduler"); + public static final Timing minecraftSchedulerTimer = Timings.ofSafe("Minecraft Scheduler");
+ public static final Timing bukkitSchedulerTimer = Timings.ofSafe("Bukkit Scheduler"); + public static final Timing bukkitSchedulerTimer = Timings.ofSafe("Bukkit Scheduler");
+ public static final Timing bukkitSchedulerPendingTimer = Timings.ofSafe("Bukkit Scheduler - Pending");
+ public static final Timing bukkitSchedulerFinishTimer = Timings.ofSafe("Bukkit Scheduler - Finishing");
+ public static final Timing chunkIOTickTimer = Timings.ofSafe("ChunkIOTick"); + public static final Timing chunkIOTickTimer = Timings.ofSafe("ChunkIOTick");
+ public static final Timing timeUpdateTimer = Timings.ofSafe("Time Update"); + public static final Timing timeUpdateTimer = Timings.ofSafe("Time Update");
+ public static final Timing serverCommandTimer = Timings.ofSafe("Server Command"); + public static final Timing serverCommandTimer = Timings.ofSafe("Server Command");
@ -49,6 +51,9 @@ index 000000000..29838de47
+ +
+ public static final Timing tickEntityTimer = Timings.ofSafe("## tickEntity"); + public static final Timing tickEntityTimer = Timings.ofSafe("## tickEntity");
+ public static final Timing tickTileEntityTimer = Timings.ofSafe("## tickTileEntity"); + public static final Timing tickTileEntityTimer = Timings.ofSafe("## tickTileEntity");
+ 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");
+ +
+ public static final Timing processQueueTimer = Timings.ofSafe("processQueue"); + public static final Timing processQueueTimer = Timings.ofSafe("processQueue");
+ +
@ -89,18 +94,19 @@ index 000000000..29838de47
+ taskname = taskClass.getCanonicalName(); + taskname = taskClass.getCanonicalName();
+ } + }
+ +
+ String name = "Task: " +taskname; + StringBuilder name = new StringBuilder(64);
+ name.append("Task: ").append(taskname);
+ if (period > 0) { + if (period > 0) {
+ name += " (interval:" + period +")"; + name.append(" (interval:").append(period).append(")");
+ } else { + } else {
+ name += " (Single)"; + name.append(" (Single)");
+ } + }
+ +
+ if (plugin == null) { + if (plugin == null) {
+ return Timings.ofSafe(null, name, TimingsManager.PLUGIN_GROUP_HANDLER); + return Timings.ofSafe(null, name.toString());
+ } + }
+ +
+ return Timings.ofSafe(plugin, name); + return Timings.ofSafe(plugin, name.toString());
+ } + }
+ +
+ /** + /**
@ -134,11 +140,15 @@ index 000000000..29838de47
+ } + }
+ +
+ public static Timing getBlockTiming(Block block) { + public static Timing getBlockTiming(Block block) {
+ return Timings.ofSafe("## Scheduled Block: " + block.getName()); + return Timings.ofSafe("## Scheduled Block: " + block.getName(), scheduledBlocksTimer);
+ } + }
+ +
+ public static Timing getStructureTiming(StructureGenerator structureGenerator) { + public static Timing getStructureTiming(StructureGenerator structureGenerator) {
+ return Timings.ofSafe("Structure Generator - " + structureGenerator.getName()); + return Timings.ofSafe("Structure Generator - " + structureGenerator.getName(), structureGenerationTimer);
+ }
+
+ public static Timing getPacketTiming(Packet packet) {
+ return Timings.ofSafe("## Packet - " + packet.getClass().getSimpleName(), packetProcessTimer);
+ } + }
+} +}
diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
@ -1037,6 +1047,36 @@ index dc630c536..12486135d 100644
// this.minecraftServer.getCommandHandler().a(this.player, s); // this.minecraftServer.getCommandHandler().a(this.player, s);
// CraftBukkit end // CraftBukkit end
} }
diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
index f74b06794..1fc632e0c 100644
--- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
+++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
@@ -1,15 +1,21 @@
package net.minecraft.server;
+import co.aikar.timings.MinecraftTimings; // Paper
+import co.aikar.timings.Timing; // Paper
+
public class PlayerConnectionUtils {
- public static <T extends PacketListener> void ensureMainThread(final Packet<T> packet, final T t0, IAsyncTaskHandler iasynctaskhandler) throws CancelledPacketHandleException {
+ // Paper start, fix decompile and add timings
+ public static <T extends PacketListener> void ensureMainThread(final Packet<T> packet, final T listener, IAsyncTaskHandler iasynctaskhandler) throws CancelledPacketHandleException {
if (!iasynctaskhandler.isMainThread()) {
- iasynctaskhandler.postToMainThread(new Runnable() {
- public void run() {
- packet.a(packetlistener);
+ Timing timing = MinecraftTimings.getPacketTiming(packet);
+ iasynctaskhandler.postToMainThread(() -> {
+ try (Timing ignored = timing.startTiming()) {
+ packet.a(listener);
}
});
throw CancelledPacketHandleException.INSTANCE;
}
}
+ // Paper end
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index c0af82b48..676cc3f3e 100644 index c0af82b48..676cc3f3e 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java --- a/src/main/java/net/minecraft/server/PlayerList.java
@ -1657,10 +1697,18 @@ index d057cce36..877a0c88d 100644
public Player.Spigot spigot() 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 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 92d217bce..198c37c3c 100644 index 92d217bce..9952b64be 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -189,7 +189,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;
+import co.aikar.timings.MinecraftTimings; // Paper
import org.apache.commons.lang.Validate;
import org.bukkit.plugin.IllegalPluginAccessException;
import org.bukkit.plugin.Plugin;
@@ -189,7 +190,7 @@ public class CraftScheduler implements BukkitScheduler {
} }
} }
return false; return false;
@ -1669,7 +1717,7 @@ index 92d217bce..198c37c3c 100644
handle(task, 0l); handle(task, 0l);
for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) { for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) { if (taskPending == task) {
@@ -222,7 +222,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -222,7 +223,7 @@ public class CraftScheduler implements BukkitScheduler {
} }
} }
} }
@ -1678,7 +1726,7 @@ index 92d217bce..198c37c3c 100644
handle(task, 0l); handle(task, 0l);
for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) { for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) { if (taskPending == task) {
@@ -254,7 +254,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -254,7 +255,7 @@ public class CraftScheduler implements BukkitScheduler {
CraftScheduler.this.pending.clear(); CraftScheduler.this.pending.clear();
CraftScheduler.this.temp.clear(); CraftScheduler.this.temp.clear();
} }
@ -1687,7 +1735,7 @@ index 92d217bce..198c37c3c 100644
handle(task, 0l); handle(task, 0l);
for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) { for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) { if (taskPending == task) {
@@ -349,9 +349,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -349,9 +350,7 @@ public class CraftScheduler implements BukkitScheduler {
} }
if (task.isSync()) { if (task.isSync()) {
try { try {
@ -1697,6 +1745,33 @@ index 92d217bce..198c37c3c 100644
} catch (final Throwable throwable) { } catch (final Throwable throwable) {
task.getOwner().getLogger().log( task.getOwner().getLogger().log(
Level.WARNING, Level.WARNING,
@@ -376,8 +375,10 @@ public class CraftScheduler implements BukkitScheduler {
runners.remove(task.getTaskId());
}
}
+ MinecraftTimings.bukkitSchedulerFinishTimer.startTiming();
pending.addAll(temp);
temp.clear();
+ MinecraftTimings.bukkitSchedulerFinishTimer.stopTiming();
debugHead = debugHead.getNextHead(currentTick);
}
@@ -409,6 +410,7 @@ public class CraftScheduler implements BukkitScheduler {
}
private void parsePending() {
+ MinecraftTimings.bukkitSchedulerPendingTimer.startTiming();
CraftTask head = this.head;
CraftTask task = head.getNext();
CraftTask lastTask = head;
@@ -427,6 +429,7 @@ public class CraftScheduler implements BukkitScheduler {
task.setNext(null);
}
this.head = lastTask;
+ MinecraftTimings.bukkitSchedulerPendingTimer.stopTiming();
}
private boolean isReady(final int currentTick) {
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
index 220e39abe..afc6c17e6 100644 index 220e39abe..afc6c17e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java

1
scripts/importmcdev.sh
View File

@ -82,6 +82,7 @@ import PathfinderGoalFloat
import PathfinderGoalGotoTarget import PathfinderGoalGotoTarget
import PathfinderWater import PathfinderWater
import PersistentVillage import PersistentVillage
import PlayerConnectionUtils
import RemoteControlListener import RemoteControlListener
import TileEntityEnderChest import TileEntityEnderChest
import TileEntityLootable import TileEntityLootable