551 Zeilen
25 KiB
Diff
551 Zeilen
25 KiB
Diff
From 7afd251cfd6c1348e94d6ee6fbd649dace08c51b Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Thu, 10 Jan 2013 00:18:11 -0500
|
|
Subject: [PATCH] Improved Timings System
|
|
|
|
Tracks nearly every point of minecraft internals and plugin events to give a good quick overview on what is causing TPS loss.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
|
index 9c99177..b88f75c 100644
|
|
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
|
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
|
@@ -106,6 +106,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
|
// CraftBukkit end
|
|
|
|
if (chunk == null) {
|
|
+ org.bukkit.craftbukkit.SpigotTimings.syncChunkLoadTimer.startTiming(); // Spigot
|
|
chunk = this.loadChunk(i, j);
|
|
if (chunk == null) {
|
|
if (this.chunkProvider == null) {
|
|
@@ -141,6 +142,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
|
}
|
|
// CraftBukkit end
|
|
chunk.a(this, this, i, j);
|
|
+ org.bukkit.craftbukkit.SpigotTimings.syncChunkLoadTimer.stopTiming(); // Spigot
|
|
}
|
|
|
|
// CraftBukkit start - If we didn't need to load the chunk run the callback now
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
|
index dc0abc5..3d6aeff 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -14,6 +14,7 @@ import org.bukkit.block.BlockFace;
|
|
import org.bukkit.entity.LivingEntity;
|
|
import org.bukkit.entity.Painting;
|
|
import org.bukkit.entity.Vehicle;
|
|
+import org.spigotmc.CustomTimingsHandler; // Spigot
|
|
import org.bukkit.event.entity.EntityCombustByEntityEvent;
|
|
import org.bukkit.event.painting.PaintingBreakByEntityEvent;
|
|
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
|
|
@@ -110,6 +111,8 @@ public abstract class Entity {
|
|
public EnumEntitySize at;
|
|
public boolean valid; // CraftBukkit
|
|
|
|
+ public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
|
|
+
|
|
public int getId() {
|
|
return this.id;
|
|
}
|
|
@@ -423,6 +426,8 @@ public abstract class Entity {
|
|
return;
|
|
}
|
|
// CraftBukkit end
|
|
+
|
|
+ org.bukkit.craftbukkit.SpigotTimings.entityMoveTimer.startTiming(); // Spigot
|
|
if (this.Y) {
|
|
this.boundingBox.d(d0, d1, d2);
|
|
this.locX = (this.boundingBox.a + this.boundingBox.d) / 2.0D;
|
|
@@ -731,6 +736,7 @@ public abstract class Entity {
|
|
|
|
this.world.methodProfiler.b();
|
|
}
|
|
+ org.bukkit.craftbukkit.SpigotTimings.entityMoveTimer.stopTiming(); // Spigot
|
|
}
|
|
|
|
protected String H() {
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index ce2aaf4..453e508 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -10,7 +10,6 @@ import java.util.ArrayList;
|
|
import java.util.Arrays;
|
|
import java.util.Collections;
|
|
import java.util.Date;
|
|
-import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.Random;
|
|
import java.util.UUID;
|
|
@@ -36,6 +35,7 @@ import jline.console.ConsoleReader;
|
|
import joptsimple.OptionSet;
|
|
|
|
import org.bukkit.World.Environment;
|
|
+import org.bukkit.craftbukkit.SpigotTimings; // Spigot
|
|
import org.bukkit.craftbukkit.util.Waitable;
|
|
import org.bukkit.event.server.RemoteServerCommandEvent;
|
|
import org.bukkit.event.world.WorldSaveEvent;
|
|
@@ -442,7 +442,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
|
currentTPS = (currentTPS * 0.95) + (1E9 / (curTime - lastTick) * 0.05);
|
|
lastTick = curTime;
|
|
MinecraftServer.currentTick++;
|
|
+ SpigotTimings.serverTickTimer.startTiming();
|
|
this.t();
|
|
+ SpigotTimings.serverTickTimer.stopTiming();
|
|
+ org.spigotmc.CustomTimingsHandler.tick();
|
|
}
|
|
// Spigot end
|
|
} else {
|
|
@@ -567,6 +570,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
|
public void u() {
|
|
this.methodProfiler.a("levels");
|
|
|
|
+ SpigotTimings.schedulerTimer.startTiming(); // Spigot
|
|
// CraftBukkit start
|
|
this.server.getScheduler().mainThreadHeartbeat(this.ticks);
|
|
|
|
@@ -575,7 +579,10 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
|
processQueue.remove().run();
|
|
}
|
|
|
|
+ SpigotTimings.schedulerTimer.stopTiming(); // Spigot
|
|
+ SpigotTimings.chunkIOTickTimer.startTiming(); // Spigot
|
|
org.bukkit.craftbukkit.chunkio.ChunkIOExecutor.tick();
|
|
+ SpigotTimings.chunkIOTickTimer.stopTiming(); // Spigot
|
|
|
|
// Send time updates to everyone, it will get the right time from the world the player is in.
|
|
if (this.ticks % 20 == 0) {
|
|
@@ -627,7 +634,9 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
|
|
|
this.methodProfiler.b();
|
|
this.methodProfiler.a("tracker");
|
|
+ worldserver.timings.tracker.startTiming(); // Spigot
|
|
worldserver.getTracker().updatePlayers();
|
|
+ worldserver.timings.tracker.stopTiming(); // Spigot
|
|
this.methodProfiler.b();
|
|
this.methodProfiler.b();
|
|
// } // CraftBukkit
|
|
@@ -636,14 +645,20 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
|
|
}
|
|
|
|
this.methodProfiler.c("connection");
|
|
+ SpigotTimings.connectionTimer.startTiming(); // Spigot
|
|
this.ag().c();
|
|
+ SpigotTimings.connectionTimer.stopTiming(); // Spigot
|
|
this.methodProfiler.c("players");
|
|
+ SpigotTimings.playerListTimer.startTiming(); // Spigot
|
|
this.t.tick();
|
|
+ SpigotTimings.playerListTimer.stopTiming(); // Spigot
|
|
this.methodProfiler.c("tickables");
|
|
|
|
+ SpigotTimings.tickablesTimer.startTiming(); // Spigot
|
|
for (i = 0; i < this.m.size(); ++i) {
|
|
((IUpdatePlayerListBox) this.m.get(i)).a();
|
|
}
|
|
+ SpigotTimings.tickablesTimer.stopTiming(); // Spigot
|
|
|
|
this.methodProfiler.b();
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index e3bd043..9cab7a9 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -914,6 +914,7 @@ public class PlayerConnection implements PacketPlayInListener {
|
|
// CraftBukkit end
|
|
|
|
private void handleCommand(String s) {
|
|
+ org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.startTiming(); // Spigot
|
|
// CraftBukkit start
|
|
CraftPlayer player = this.getPlayer();
|
|
|
|
@@ -921,19 +922,23 @@ public class PlayerConnection implements PacketPlayInListener {
|
|
this.server.getPluginManager().callEvent(event);
|
|
|
|
if (event.isCancelled()) {
|
|
+ org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
|
|
return;
|
|
}
|
|
|
|
try {
|
|
this.c.info(event.getPlayer().getName() + " issued server command: " + event.getMessage()); // CraftBukkit
|
|
if (this.server.dispatchCommand(event.getPlayer(), event.getMessage().substring(1))) {
|
|
+ org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
|
|
return;
|
|
}
|
|
} catch (org.bukkit.command.CommandException ex) {
|
|
player.sendMessage(org.bukkit.ChatColor.RED + "An internal error occurred while attempting to perform this command");
|
|
java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
|
|
+ org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
|
|
return;
|
|
}
|
|
+ org.bukkit.craftbukkit.SpigotTimings.playerCommandTimer.stopTiming(); // Spigot
|
|
//this.minecraftServer.getCommandHandler().a(this.player, s);
|
|
// CraftBukkit end
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
|
index 811f1a4..3de32fe 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
|
@@ -7,10 +7,12 @@ import java.util.concurrent.Callable;
|
|
import org.apache.logging.log4j.LogManager;
|
|
import org.apache.logging.log4j.Logger;
|
|
|
|
+import org.spigotmc.CustomTimingsHandler; // Spigot
|
|
import org.bukkit.inventory.InventoryHolder; // CraftBukkit
|
|
|
|
public class TileEntity {
|
|
|
|
+ public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getTileEntityTimings(this); // Spigot
|
|
private static final Logger a = LogManager.getLogger();
|
|
private static Map i = new HashMap();
|
|
private static Map j = new HashMap();
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index e580460..5cfcc6c 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -14,6 +14,7 @@ import java.util.concurrent.Callable;
|
|
import org.bukkit.Bukkit;
|
|
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
|
|
import org.bukkit.craftbukkit.util.LongHashSet;
|
|
+import org.bukkit.craftbukkit.SpigotTimings; // Spigot
|
|
import org.bukkit.craftbukkit.util.UnsafeList;
|
|
import org.bukkit.generator.ChunkGenerator;
|
|
import org.bukkit.craftbukkit.CraftServer;
|
|
@@ -133,6 +134,8 @@ public abstract class World implements IBlockAccess {
|
|
final Object chunkLock = new Object();
|
|
public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
|
|
|
|
+ public final SpigotTimings.WorldTimingsHandler timings; // Spigot
|
|
+
|
|
public CraftWorld getWorld() {
|
|
return this.world;
|
|
}
|
|
@@ -212,6 +215,7 @@ public abstract class World implements IBlockAccess {
|
|
this.a();
|
|
|
|
this.getServer().addWorld(this.world); // CraftBukkit
|
|
+ timings = new SpigotTimings.WorldTimingsHandler(this); // Spigot
|
|
}
|
|
|
|
protected abstract IChunkProvider j();
|
|
@@ -1249,6 +1253,7 @@ public abstract class World implements IBlockAccess {
|
|
this.f.clear();
|
|
this.methodProfiler.c("regular");
|
|
|
|
+ timings.entityTick.startTiming(); // Spigot
|
|
for (i = 0; i < this.entityList.size(); ++i) {
|
|
entity = (Entity) this.entityList.get(i);
|
|
|
|
@@ -1271,7 +1276,9 @@ public abstract class World implements IBlockAccess {
|
|
this.methodProfiler.a("tick");
|
|
if (!entity.dead) {
|
|
try {
|
|
+ SpigotTimings.tickEntityTimer.startTiming(); // Spigot
|
|
this.playerJoinedWorld(entity);
|
|
+ SpigotTimings.tickEntityTimer.stopTiming(); // Spigot
|
|
} catch (Throwable throwable1) {
|
|
crashreport = CrashReport.a(throwable1, "Ticking entity");
|
|
crashreportsystemdetails = crashreport.a("Entity being ticked");
|
|
@@ -1296,7 +1303,9 @@ public abstract class World implements IBlockAccess {
|
|
this.methodProfiler.b();
|
|
}
|
|
|
|
+ timings.entityTick.stopTiming(); // Spigot
|
|
this.methodProfiler.c("blockEntities");
|
|
+ timings.tileEntityTick.startTiming(); // Spigot
|
|
this.N = true;
|
|
Iterator iterator = this.tileEntityList.iterator();
|
|
|
|
@@ -1311,8 +1320,11 @@ public abstract class World implements IBlockAccess {
|
|
|
|
if (!tileentity.r() && tileentity.o() && this.isLoaded(tileentity.x, tileentity.y, tileentity.z)) {
|
|
try {
|
|
+ tileentity.tickTimer.startTiming(); // Spigot
|
|
tileentity.h();
|
|
+ tileentity.tickTimer.stopTiming(); // Spigot
|
|
} catch (Throwable throwable2) {
|
|
+ tileentity.tickTimer.stopTiming(); // Spigot
|
|
crashreport = CrashReport.a(throwable2, "Ticking block entity");
|
|
crashreportsystemdetails = crashreport.a("Block entity being ticked");
|
|
tileentity.a(crashreportsystemdetails);
|
|
@@ -1332,6 +1344,8 @@ public abstract class World implements IBlockAccess {
|
|
}
|
|
}
|
|
|
|
+ timings.tileEntityTick.stopTiming(); // Spigot
|
|
+ timings.tileEntityPending.startTiming(); // Spigot
|
|
this.N = false;
|
|
if (!this.b.isEmpty()) {
|
|
this.tileEntityList.removeAll(this.b);
|
|
@@ -1370,6 +1384,7 @@ public abstract class World implements IBlockAccess {
|
|
this.a.clear();
|
|
}
|
|
|
|
+ timings.tileEntityPending.stopTiming(); // Spigot
|
|
this.methodProfiler.b();
|
|
this.methodProfiler.b();
|
|
}
|
|
@@ -1392,6 +1407,7 @@ public abstract class World implements IBlockAccess {
|
|
byte b0 = 32;
|
|
|
|
if (!flag || this.b(i - b0, 0, j - b0, i + b0, 0, j + b0)) {
|
|
+ entity.tickTimer.startTiming(); // Spigot
|
|
entity.T = entity.locX;
|
|
entity.U = entity.locY;
|
|
entity.V = entity.locZ;
|
|
@@ -1453,6 +1469,7 @@ public abstract class World implements IBlockAccess {
|
|
entity.passenger = null;
|
|
}
|
|
}
|
|
+ entity.tickTimer.stopTiming(); // Spigot
|
|
}
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index 9f09a3d..74a2d45 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -184,10 +184,12 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
|
|
// CraftBukkit start - Only call spawner if we have players online and the world allows for mobs or animals
|
|
long time = this.worldData.getTime();
|
|
if (this.getGameRules().getBoolean("doMobSpawning") && (this.allowMonsters || this.allowAnimals) && (this instanceof WorldServer && this.players.size() > 0)) {
|
|
+ timings.mobSpawn.startTiming(); // Spigot
|
|
this.R.spawnEntities(this, this.allowMonsters && (this.ticksPerMonsterSpawns != 0 && time % this.ticksPerMonsterSpawns == 0L), this.allowAnimals && (this.ticksPerAnimalSpawns != 0 && time % this.ticksPerAnimalSpawns == 0L), this.worldData.getTime() % 400L == 0L);
|
|
- // CraftBukkit end
|
|
+ timings.mobSpawn.stopTiming(); // Spigot
|
|
}
|
|
-
|
|
+ // CraftBukkit end
|
|
+ timings.doChunkUnload.startTiming(); // Spigot
|
|
this.methodProfiler.c("chunkSource");
|
|
this.chunkProvider.unloadChunks();
|
|
int j = this.a(1.0F);
|
|
@@ -201,21 +203,36 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
|
|
this.worldData.setDayTime(this.worldData.getDayTime() + 1L);
|
|
}
|
|
|
|
+ timings.doChunkUnload.stopTiming(); // Spigot
|
|
this.methodProfiler.c("tickPending");
|
|
+ timings.doTickPending.startTiming(); // Spigot
|
|
this.a(false);
|
|
+ timings.doTickPending.stopTiming(); // Spigot
|
|
this.methodProfiler.c("tickBlocks");
|
|
+ timings.doTickTiles.startTiming(); // Spigot
|
|
this.g();
|
|
+ timings.doTickTiles.stopTiming(); // Spigot
|
|
this.methodProfiler.c("chunkMap");
|
|
+ timings.doChunkMap.startTiming(); // Spigot
|
|
this.manager.flush();
|
|
+ timings.doChunkMap.stopTiming(); // Spigot
|
|
this.methodProfiler.c("village");
|
|
+ timings.doVillages.startTiming(); // Spigot
|
|
this.villages.tick();
|
|
this.siegeManager.a();
|
|
+ timings.doVillages.stopTiming(); // Spigot
|
|
this.methodProfiler.c("portalForcer");
|
|
+ timings.doPortalForcer.startTiming(); // Spigot
|
|
this.Q.a(this.getTime());
|
|
+ timings.doPortalForcer.stopTiming(); // Spigot
|
|
this.methodProfiler.b();
|
|
+ timings.doSounds.startTiming(); // Spigot
|
|
this.Z();
|
|
+ timings.doSounds.stopTiming(); // Spigot
|
|
|
|
+ timings.doChunkGC.startTiming(); // Spigot
|
|
this.getWorld().processChunkGC(); // CraftBukkit
|
|
+ timings.doChunkGC.stopTiming(); // Spigot
|
|
}
|
|
|
|
public BiomeMeta a(EnumCreatureType enumcreaturetype, int i, int j, int k) {
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
|
|
new file mode 100644
|
|
index 0000000..8340c13
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
|
|
@@ -0,0 +1,125 @@
|
|
+package org.bukkit.craftbukkit;
|
|
+
|
|
+import net.minecraft.server.*;
|
|
+import org.spigotmc.CustomTimingsHandler;
|
|
+import org.bukkit.scheduler.BukkitTask;
|
|
+
|
|
+import java.util.HashMap;
|
|
+import org.bukkit.craftbukkit.scheduler.CraftTask;
|
|
+
|
|
+public class SpigotTimings {
|
|
+
|
|
+ public static final CustomTimingsHandler serverTickTimer = new CustomTimingsHandler("** Full Server Tick");
|
|
+ public static final CustomTimingsHandler playerListTimer = new CustomTimingsHandler("Player List");
|
|
+ public static final CustomTimingsHandler connectionTimer = new CustomTimingsHandler("Player Tick");
|
|
+ public static final CustomTimingsHandler tickablesTimer = new CustomTimingsHandler("Tickables");
|
|
+ public static final CustomTimingsHandler schedulerTimer = new CustomTimingsHandler("Scheduler");
|
|
+ public static final CustomTimingsHandler chunkIOTickTimer = new CustomTimingsHandler("ChunkIOTick");
|
|
+ public static final CustomTimingsHandler syncChunkLoadTimer = new CustomTimingsHandler("syncChunkLoad");
|
|
+
|
|
+ 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 playerCommandTimer = new CustomTimingsHandler("** playerCommand");
|
|
+
|
|
+ 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) {
|
|
+ String plugin = task.getOwner().getDescription().getFullName();
|
|
+ String name = "Task: " + plugin + " Runnable: " + ( (CraftTask) task ).getTaskClass().getSimpleName();
|
|
+ if (period > 0) {
|
|
+ name += "(interval:" + period +")";
|
|
+ } else {
|
|
+ name += "(Single)";
|
|
+ }
|
|
+ CustomTimingsHandler result = pluginTaskTimingMap.get(name);
|
|
+ if (result == null) {
|
|
+ result = new CustomTimingsHandler(name);
|
|
+ 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) {
|
|
+ String entityType = entity.getClass().getSimpleName();
|
|
+ CustomTimingsHandler result = entityTypeTimingMap.get(entityType);
|
|
+ if (result == null) {
|
|
+ result = new CustomTimingsHandler("** tickEntity - " + entityType, activatedEntityTimer);
|
|
+ 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) {
|
|
+ String entityType = entity.getClass().getSimpleName();
|
|
+ CustomTimingsHandler result = tileEntityTypeTimingMap.get(entityType);
|
|
+ if (result == null) {
|
|
+ result = new CustomTimingsHandler("** tickTileEntity - " + entityType, tickTileEntityTimer);
|
|
+ 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 doPortalForcer;
|
|
+ public final CustomTimingsHandler doTickPending;
|
|
+ public final CustomTimingsHandler doTickTiles;
|
|
+ public final CustomTimingsHandler doVillages;
|
|
+ public final CustomTimingsHandler doChunkMap;
|
|
+ public final CustomTimingsHandler doChunkGC;
|
|
+ public final CustomTimingsHandler doSounds;
|
|
+ public final CustomTimingsHandler entityTick;
|
|
+ public final CustomTimingsHandler tileEntityTick;
|
|
+ public final CustomTimingsHandler tileEntityPending;
|
|
+ public final CustomTimingsHandler tracker;
|
|
+
|
|
+ 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");
|
|
+ doVillages = new CustomTimingsHandler(name + "doVillages");
|
|
+ doChunkMap = new CustomTimingsHandler(name + "doChunkMap");
|
|
+ doSounds = new CustomTimingsHandler(name + "doSounds");
|
|
+ doChunkGC = new CustomTimingsHandler(name + "doChunkGC");
|
|
+ doPortalForcer = new CustomTimingsHandler(name + "doPortalForcer");
|
|
+ entityTick = new CustomTimingsHandler(name + "entityTick");
|
|
+ tileEntityTick = new CustomTimingsHandler(name + "tileEntityTick");
|
|
+ tileEntityPending = new CustomTimingsHandler(name + "tileEntityPending");
|
|
+ tracker = new CustomTimingsHandler(name + "tracker");
|
|
+ }
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
|
index 55db3ff..7d294c0 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
|
@@ -1,11 +1,13 @@
|
|
package org.bukkit.craftbukkit.scheduler;
|
|
|
|
import org.bukkit.Bukkit;
|
|
+import org.bukkit.craftbukkit.SpigotTimings; // Spigot
|
|
+import org.spigotmc.CustomTimingsHandler; // Spigot
|
|
import org.bukkit.plugin.Plugin;
|
|
import org.bukkit.scheduler.BukkitTask;
|
|
|
|
|
|
-class CraftTask implements BukkitTask, Runnable {
|
|
+public class CraftTask implements BukkitTask, Runnable { // Spigot
|
|
|
|
private volatile CraftTask next = null;
|
|
/**
|
|
@@ -22,6 +24,7 @@ class CraftTask implements BukkitTask, Runnable {
|
|
private final Plugin plugin;
|
|
private final int id;
|
|
|
|
+ CustomTimingsHandler timings = null; // Spigot
|
|
CraftTask() {
|
|
this(null, null, -1, -1);
|
|
}
|
|
@@ -50,7 +53,22 @@ class CraftTask implements BukkitTask, Runnable {
|
|
}
|
|
|
|
public void run() {
|
|
+ // Spigot start - Wrap custom timings on Tasks
|
|
+ if (!Bukkit.getServer().getPluginManager().useTimings()) {
|
|
+ task.run();
|
|
+ return;
|
|
+ }
|
|
+ if (timings == null && this.getOwner() != null && this.isSync()) {
|
|
+ timings = SpigotTimings.getPluginTaskTimings(this, period);
|
|
+ }
|
|
+ if (timings != null) {
|
|
+ timings.startTiming();
|
|
+ }
|
|
task.run();
|
|
+ if (timings != null) {
|
|
+ timings.stopTiming();
|
|
+ }
|
|
+ // Spigot end
|
|
}
|
|
|
|
long getPeriod() {
|
|
@@ -77,7 +95,7 @@ class CraftTask implements BukkitTask, Runnable {
|
|
this.next = next;
|
|
}
|
|
|
|
- Class<? extends Runnable> getTaskClass() {
|
|
+ public Class<? extends Runnable> getTaskClass() { // Spigot
|
|
return task.getClass();
|
|
}
|
|
|
|
--
|
|
1.8.3.2
|
|
|