From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Sun, 12 May 2024 20:58:42 +0300 Subject: [PATCH] Delete Timings diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java deleted file mode 100644 index 6b3cde6d4d1e63bec01f502f2027ee9fddac08aa..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ /dev/null @@ -1,178 +0,0 @@ -package co.aikar.timings; - -import com.google.common.collect.MapMaker; -import io.papermc.paper.configuration.GlobalConfiguration; -import net.minecraft.commands.functions.CommandFunction; -import net.minecraft.network.protocol.Packet; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntity; -import org.bukkit.plugin.Plugin; -import org.bukkit.scheduler.BukkitTask; - -import org.bukkit.craftbukkit.scheduler.CraftTask; - -import java.util.Map; - -// TODO: Re-implement missing timers -@Deprecated(forRemoval = true) -public final class MinecraftTimings { - - public static final Timing serverOversleep = Timings.ofSafe("Server Oversleep"); - public static final Timing playerListTimer = Timings.ofSafe("Player List"); - public static final Timing commandFunctionsTimer = Timings.ofSafe("Command Functions"); - public static final Timing connectionTimer = Timings.ofSafe("Connection Handler"); - public static final Timing tickablesTimer = Timings.ofSafe("Tickables"); - public static final Timing minecraftSchedulerTimer = Timings.ofSafe("Minecraft 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 timeUpdateTimer = Timings.ofSafe("Time Update"); - public static final Timing serverCommandTimer = Timings.ofSafe("Server Command"); - public static final Timing savePlayers = Timings.ofSafe("Save Players"); - - public static final Timing tickEntityTimer = Timings.ofSafe("## tickEntity"); - 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 processTasksTimer = Timings.ofSafe("processTasks"); - - 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"); - public static final Timing scoreboardScoreSearch = Timings.ofSafe("Scoreboard score search"); // Paper - add timings for scoreboard search - - private static final Map, String> taskNameCache = new MapMaker().weakKeys().makeMap(); - - private MinecraftTimings() {} - - public static Timing getInternalTaskName(String taskName) { - return Timings.ofSafe(taskName); - } - - /** - * Gets a timer associated with a plugins tasks. - * @param bukkitTask - * @param period - * @return - */ - public static Timing getPluginTaskTimings(BukkitTask bukkitTask, long period) { - if (!bukkitTask.isSync()) { - return NullTimingHandler.NULL; - } - Plugin plugin; - - CraftTask craftTask = (CraftTask) bukkitTask; - - final Class taskClass = craftTask.getTaskClass(); - if (bukkitTask.getOwner() != null) { - plugin = bukkitTask.getOwner(); - } else { - plugin = TimingsManager.getPluginByClassloader(taskClass); - } - - final String taskname = taskNameCache.computeIfAbsent(taskClass, clazz -> { - try { - String clsName = !clazz.isMemberClass() - ? clazz.getName() - : clazz.getCanonicalName(); - if (clsName != null && clsName.contains("$Lambda$")) { - clsName = clsName.replaceAll("(Lambda\\$.*?)/.*", "$1"); - } - return clsName != null ? clsName : "UnknownTask"; - } catch (Throwable ex) { - new Exception("Error occurred detecting class name", ex).printStackTrace(); - return "MangledClassFile"; - } - }); - - StringBuilder name = new StringBuilder(64); - name.append("Task: ").append(taskname); - if (period > 0) { - name.append(" (interval:").append(period).append(")"); - } else { - name.append(" (Single)"); - } - - if (plugin == null) { - return Timings.ofSafe(null, name.toString()); - } - - return Timings.ofSafe(plugin, name.toString()); - } - - /** - * Get a named timer for the specified entity type to track type specific timings. - * @param entityType - * @return - */ - public static Timing getEntityTimings(String entityType, String type) { - return Timings.ofSafe("Minecraft", "## tickEntity - " + entityType + " - " + type, tickEntityTimer); - } - - public static Timing getBehaviorTimings(String type) { - return Timings.ofSafe("## Behavior - " + type); - } - - public static Timing getSensorTimings(String type, int rate) { - return Timings.ofSafe("## Sensor - " + type + " (Default rate: " + rate + ")"); - } - - /** - * Get a named timer for the specified tile entity type to track type specific timings. - * @param entity - * @return - */ - public static Timing getTileEntityTimings(BlockEntity 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) { - return Timings.ofSafe("## Scheduled Block: " + block.toString(), scheduledBlocksTimer); - } -/* - public static Timing getStructureTiming(StructureGenerator structureGenerator) { - return Timings.ofSafe("Structure Generator - " + structureGenerator.getName(), structureGenerationTimer); - }*/ - - public static Timing getPacketTiming(Packet packet) { - return Timings.ofSafe("## Packet - " + packet.getClass().getName(), packetProcessTimer); - } - - public static Timing getCommandFunctionTiming(CommandFunction function) { - return Timings.ofSafe("Command Function - " + function.id()); - } - - public static void processConfig(GlobalConfiguration.Timings config) { - TimingsManager.url = config.url; - if (!TimingsManager.url.endsWith("/")) { - TimingsManager.url += "/"; - } - TimingsManager.privacy = config.serverNamePrivacy; - if (!config.hiddenConfigEntries.contains("proxies.velocity.secret")) { - config.hiddenConfigEntries.add("proxies.velocity.secret"); - } - TimingsManager.hiddenConfigs.addAll(config.hiddenConfigEntries); - co.aikar.timings.Timings.setVerboseTimingsEnabled(config.verbose); - co.aikar.timings.Timings.setTimingsEnabled(config.enabled); - co.aikar.timings.Timings.setHistoryInterval(config.historyInterval * 20); - co.aikar.timings.Timings.setHistoryLength(config.historyLength * 20); - } -} diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java deleted file mode 100644 index 7620c72a4c243cbeea245203ce03a97cbfa7d922..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ /dev/null @@ -1,388 +0,0 @@ -/* - * This file is licensed under the MIT License (MIT). - * - * Copyright (c) 2014 Daniel Ennis - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package co.aikar.timings; - -import com.google.common.collect.Sets; -import io.papermc.paper.adventure.PaperAdventure; -import net.kyori.adventure.text.event.ClickEvent; -import net.kyori.adventure.text.format.NamedTextColor; -import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; -import net.minecraft.server.MinecraftServer; -import org.apache.commons.lang.StringUtils; -import org.bukkit.Bukkit; -import org.bukkit.Material; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.MemorySection; -import org.bukkit.entity.EntityType; -import org.json.simple.JSONObject; -import org.json.simple.JSONValue; -import oshi.SystemInfo; -import oshi.hardware.HardwareAbstractionLayer; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.lang.management.ManagementFactory; -import java.lang.management.OperatingSystemMXBean; -import java.lang.management.RuntimeMXBean; -import java.net.HttpURLConnection; -import java.net.InetAddress; -import java.net.URL; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.logging.Level; -import java.util.zip.GZIPOutputStream; - -import static co.aikar.timings.TimingsManager.HISTORY; -import static co.aikar.util.JSONUtil.appendObjectData; -import static co.aikar.util.JSONUtil.createObject; -import static co.aikar.util.JSONUtil.pair; -import static co.aikar.util.JSONUtil.toArray; -import static co.aikar.util.JSONUtil.toArrayMapper; -import static co.aikar.util.JSONUtil.toObjectMapper; -import static net.kyori.adventure.text.Component.text; - -@SuppressWarnings({"rawtypes", "SuppressionAnnotation"}) -@Deprecated(forRemoval = true) -public class TimingsExport extends Thread { - - private final TimingsReportListener listeners; - private final Map out; - private final TimingHistory[] history; - private static long lastReport = 0; - - private TimingsExport(TimingsReportListener listeners, Map out, TimingHistory[] history) { - super("Timings paste thread"); - this.listeners = listeners; - this.out = out; - this.history = history; - } - - /** - * Checks if any pending reports are being requested, and builds one if needed. - */ - public static void reportTimings() { - if (Timings.requestingReport.isEmpty()) { - return; - } - TimingsReportListener listeners = new TimingsReportListener(Timings.requestingReport); - listeners.addConsoleIfNeeded(); - - Timings.requestingReport.clear(); - long now = System.currentTimeMillis(); - final long lastReportDiff = now - lastReport; - if (lastReportDiff < 60000) { - listeners.sendMessage(text("Please wait at least 1 minute in between Timings reports. (" + (int)((60000 - lastReportDiff) / 1000) + " seconds)", NamedTextColor.RED)); - listeners.done(); - return; - } - final long lastStartDiff = now - TimingsManager.timingStart; - if (lastStartDiff < 180000) { - listeners.sendMessage(text("Please wait at least 3 minutes before generating a Timings report. Unlike Timings v1, v2 benefits from longer timings and is not as useful with short timings. (" + (int)((180000 - lastStartDiff) / 1000) + " seconds)", NamedTextColor.RED)); - listeners.done(); - return; - } - listeners.sendMessage(text("Preparing Timings Report...", NamedTextColor.GREEN)); - lastReport = now; - Map parent = createObject( - // Get some basic system details about the server - pair("version", Bukkit.getVersion()), - pair("maxplayers", Bukkit.getMaxPlayers()), - pair("start", TimingsManager.timingStart / 1000), - pair("end", System.currentTimeMillis() / 1000), - pair("online-mode", Bukkit.getServer().getOnlineMode()), - pair("sampletime", (System.currentTimeMillis() - TimingsManager.timingStart) / 1000), - pair("datapacks", toArrayMapper(MinecraftServer.getServer().getPackRepository().getSelectedPacks(), pack -> { - return PlainTextComponentSerializer.plainText().serialize(PaperAdventure.asAdventure(pack.getChatLink(true))); - })) - ); - if (!TimingsManager.privacy) { - appendObjectData(parent, - pair("server", Bukkit.getUnsafe().getTimingsServerName()), - pair("motd", Bukkit.getServer().getMotd()), - pair("icon", Bukkit.getServer().getServerIcon().getData()) - ); - } - - final Runtime runtime = Runtime.getRuntime(); - RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean(); - - OperatingSystemMXBean osInfo = ManagementFactory.getOperatingSystemMXBean(); - - HardwareAbstractionLayer hardwareInfo = new SystemInfo().getHardware(); - - parent.put("system", createObject( - pair("timingcost", getCost()), - pair("loadavg", osInfo.getSystemLoadAverage()), - pair("name", System.getProperty("os.name")), - pair("version", System.getProperty("os.version")), - pair("jvmversion", System.getProperty("java.version")), - pair("jvmvendor", System.getProperty("java.vendor")), - pair("jvmvendorversion", System.getProperty("java.vendor.version")), - pair("arch", System.getProperty("os.arch")), - pair("maxmem", runtime.maxMemory()), - pair("memory", createObject( - pair("heap", ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().toString()), - pair("nonheap", ManagementFactory.getMemoryMXBean().getNonHeapMemoryUsage().toString()), - pair("finalizing", ManagementFactory.getMemoryMXBean().getObjectPendingFinalizationCount()) - )), - pair("cpu", runtime.availableProcessors()), - pair("cpuname", hardwareInfo.getProcessor().getProcessorIdentifier().getName().trim()), - pair("runtime", runtimeBean.getUptime()), - pair("flags", StringUtils.join(runtimeBean.getInputArguments(), " ")), - pair("gc", toObjectMapper(ManagementFactory.getGarbageCollectorMXBeans(), input -> pair(input.getName(), toArray(input.getCollectionCount(), input.getCollectionTime())))) - ) - ); - - parent.put("worlds", toObjectMapper(MinecraftServer.getServer().getAllLevels(), world -> { - if (world.getWorld().getName().equals("worldeditregentempworld")) return null; - return pair(world.getWorld().getName(), createObject( - pair("gamerules", toObjectMapper(world.getWorld().getGameRules(), rule -> { - return pair(rule, world.getWorld().getGameRuleValue(rule)); - })), - pair("ticking-distance", world.getWorld().getSimulationDistance()), - pair("no-ticking-distance", world.getWorld().getViewDistance()), - pair("sending-distance", world.getWorld().getSendViewDistance()) - )); - })); - - Set tileEntityTypeSet = Sets.newHashSet(); - Set entityTypeSet = Sets.newHashSet(); - - int size = HISTORY.size(); - TimingHistory[] history = new TimingHistory[size + 1]; - int i = 0; - for (TimingHistory timingHistory : HISTORY) { - tileEntityTypeSet.addAll(timingHistory.tileEntityTypeSet); - entityTypeSet.addAll(timingHistory.entityTypeSet); - history[i++] = timingHistory; - } - - history[i] = new TimingHistory(); // Current snapshot - tileEntityTypeSet.addAll(history[i].tileEntityTypeSet); - entityTypeSet.addAll(history[i].entityTypeSet); - - - Map handlers = createObject(); - Map groupData; - synchronized (TimingIdentifier.GROUP_MAP) { - for (TimingIdentifier.TimingGroup group : TimingIdentifier.GROUP_MAP.values()) { - synchronized (group.handlers) { - for (TimingHandler id : group.handlers) { - - if (!id.isTimed() && !id.isSpecial()) { - continue; - } - - String name = id.identifier.name; - if (name.startsWith("##")) { - name = name.substring(3); - } - handlers.put(id.id, toArray( - group.id, - name - )); - } - } - } - - groupData = toObjectMapper( - TimingIdentifier.GROUP_MAP.values(), group -> pair(group.id, group.name)); - } - - parent.put("idmap", createObject( - pair("groups", groupData), - pair("handlers", handlers), - pair("worlds", toObjectMapper(TimingHistory.worldMap.entrySet(), input -> pair(input.getValue(), input.getKey()))), - pair("tileentity", - toObjectMapper(tileEntityTypeSet, input -> pair(input.ordinal(), input.name()))), - pair("entity", - toObjectMapper(entityTypeSet, input -> pair(input.ordinal(), input.name()))) - )); - - // Information about loaded plugins - - parent.put("plugins", toObjectMapper(Bukkit.getPluginManager().getPlugins(), - plugin -> pair(plugin.getName(), createObject( - pair("version", plugin.getDescription().getVersion()), - pair("description", String.valueOf(plugin.getDescription().getDescription()).trim()), - pair("website", plugin.getDescription().getWebsite()), - pair("authors", StringUtils.join(plugin.getDescription().getAuthors(), ", ")) - )))); - - - - // Information on the users Config - - parent.put("config", createObject( - pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)), - pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)), - pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)) - )); - - new TimingsExport(listeners, parent, history).start(); - } - - static long getCost() { - // Benchmark the users System.nanotime() for cost basis - int passes = 100; - TimingHandler SAMPLER1 = Timings.ofSafe("Timings Sampler 1"); - TimingHandler SAMPLER2 = Timings.ofSafe("Timings Sampler 2"); - TimingHandler SAMPLER3 = Timings.ofSafe("Timings Sampler 3"); - TimingHandler SAMPLER4 = Timings.ofSafe("Timings Sampler 4"); - TimingHandler SAMPLER5 = Timings.ofSafe("Timings Sampler 5"); - TimingHandler SAMPLER6 = Timings.ofSafe("Timings Sampler 6"); - - long start = System.nanoTime(); - for (int i = 0; i < passes; i++) { - SAMPLER1.startTiming(); - SAMPLER2.startTiming(); - SAMPLER3.startTiming(); - SAMPLER3.stopTiming(); - SAMPLER4.startTiming(); - SAMPLER5.startTiming(); - SAMPLER6.startTiming(); - SAMPLER6.stopTiming(); - SAMPLER5.stopTiming(); - SAMPLER4.stopTiming(); - SAMPLER2.stopTiming(); - SAMPLER1.stopTiming(); - } - long timingsCost = (System.nanoTime() - start) / passes / 6; - SAMPLER1.reset(true); - SAMPLER2.reset(true); - SAMPLER3.reset(true); - SAMPLER4.reset(true); - SAMPLER5.reset(true); - SAMPLER6.reset(true); - return timingsCost; - } - - private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) { - - JSONObject object = new JSONObject(); - for (String key : config.getKeys(false)) { - String fullKey = (parentKey != null ? parentKey + "." + key : key); - if (fullKey.equals("database") || fullKey.equals("settings.bungeecord-addresses") || TimingsManager.hiddenConfigs.contains(fullKey) || key.startsWith("seed-") || key.equals("worldeditregentempworld") || key.equals("feature-seeds")) { - continue; - } - final Object val = config.get(key); - - object.put(key, valAsJSON(val, fullKey)); - } - return object; - } - - private static Object valAsJSON(Object val, final String parentKey) { - if (!(val instanceof MemorySection)) { - if (val instanceof List) { - Iterable v = (Iterable) val; - return toArrayMapper(v, input -> valAsJSON(input, parentKey)); - } else { - return String.valueOf(val); - } - } else { - return mapAsJSON((ConfigurationSection) val, parentKey); - } - } - - @Override - public void run() { - out.put("data", toArrayMapper(history, TimingHistory::export)); - - - String response = null; - String timingsURL = null; - try { - HttpURLConnection con = (HttpURLConnection) new URL(TimingsManager.url + "post").openConnection(); - con.setDoOutput(true); - String hostName = "BrokenHost"; - try { - hostName = InetAddress.getLocalHost().getHostName(); - } catch (Exception ignored) {} - con.setRequestProperty("User-Agent", "Paper/" + Bukkit.getUnsafe().getTimingsServerName() + "/" + hostName); - con.setRequestMethod("POST"); - con.setInstanceFollowRedirects(false); - - OutputStream request = new GZIPOutputStream(con.getOutputStream()) {{ - this.def.setLevel(7); - }}; - - request.write(JSONValue.toJSONString(out).getBytes("UTF-8")); - request.close(); - - response = getResponse(con); - - if (con.getResponseCode() != 302) { - listeners.sendMessage(text( "Upload Error: " + con.getResponseCode() + ": " + con.getResponseMessage(), NamedTextColor.RED)); - listeners.sendMessage(text("Check your logs for more information", NamedTextColor.RED)); - if (response != null) { - Bukkit.getLogger().log(Level.SEVERE, response); - } - return; - } - - timingsURL = con.getHeaderField("Location"); - listeners.sendMessage(text("View Timings Report: ", NamedTextColor.GREEN).append(text(timingsURL).clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, timingsURL)))); - - if (response != null && !response.isEmpty()) { - Bukkit.getLogger().log(Level.INFO, "Timing Response: " + response); - } - } catch (IOException ex) { - listeners.sendMessage(text("Error uploading timings, check your logs for more information", NamedTextColor.RED)); - if (response != null) { - Bukkit.getLogger().log(Level.SEVERE, response); - } - Bukkit.getLogger().log(Level.SEVERE, "Could not paste timings", ex); - } finally { - this.listeners.done(timingsURL); - } - } - - private String getResponse(HttpURLConnection con) throws IOException { - InputStream is = null; - try { - is = con.getInputStream(); - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - - byte[] b = new byte[1024]; - int bytesRead; - while ((bytesRead = is.read(b)) != -1) { - bos.write(b, 0, bytesRead); - } - return bos.toString(); - - } catch (IOException ex) { - listeners.sendMessage(text("Error uploading timings, check your logs for more information", NamedTextColor.RED)); - Bukkit.getLogger().log(Level.WARNING, con.getResponseMessage(), ex); - return null; - } finally { - if (is != null) { - is.close(); - } - } - } -} diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java deleted file mode 100644 index 2f0d9b953802dee821cfde82d22b0567cce8ee91..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java +++ /dev/null @@ -1,120 +0,0 @@ -package co.aikar.timings; - -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.storage.PrimaryLevelData; - -/** - * Set of timers per world, to track world specific timings. - */ -// TODO: Re-implement missing timers -@Deprecated(forRemoval = true) -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; - public final Timing lightChunk; - public final Timing chunkTicksBlocks; - public final Timing doVillages; - public final Timing doChunkMap; - 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; - public final Timing doChunkGC; - public final Timing doSounds; - public final Timing entityRemoval; - public final Timing entityTick; - public final Timing tileEntityTick; - public final Timing tileEntityPending; - public final Timing tracker1; - public final Timing tracker2; - public final Timing doTick; - public final Timing tickEntities; - public final Timing chunks; - public final Timing newEntities; - public final Timing raids; - public final Timing chunkProviderTick; - public final Timing broadcastChunkUpdates; - public final Timing countNaturalMobs; - - public final Timing chunkLoad; - public final Timing chunkLoadPopulate; - public final Timing syncChunkLoad; - public final Timing chunkLoadLevelTimer; - public final Timing chunkIO; - public final Timing chunkPostLoad; - public final Timing worldSave; - public final Timing worldSaveChunks; - public final Timing worldSaveLevel; - public final Timing chunkSaveData; - - - public final Timing miscMobSpawning; - - public WorldTimingsHandler(Level server) { - String name = ((PrimaryLevelData) server.getLevelData()).getLevelName() + " - "; - - 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"); - lightChunk = Timings.ofSafe(name + "Light Chunk"); - chunkTicksBlocks = Timings.ofSafe(name + "Chunk Ticks - Blocks"); - doVillages = Timings.ofSafe(name + "doVillages"); - doChunkMap = Timings.ofSafe(name + "doChunkMap"); - 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"); - 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"); - - 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"); - 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"); - - tracker1 = Timings.ofSafe(name + "tracker stage 1"); - tracker2 = Timings.ofSafe(name + "tracker stage 2"); - doTick = Timings.ofSafe(name + "doTick"); - tickEntities = Timings.ofSafe(name + "tickEntities"); - - 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"); - - - miscMobSpawning = Timings.ofSafe(name + "Mob spawning - Misc"); - } - - public static Timing getTickList(ServerLevel worldserver, String timingsType) { - return Timings.ofSafe(((PrimaryLevelData) worldserver.getLevelData()).getLevelName() + " - Scheduled " + timingsType); - } -} diff --git a/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java b/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java index 24121a43aeb5e9bce013f30c92dddd15f99736c6..791cb04a13597eee4dbd28fabe2835ab41eb13f9 100644 --- a/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java +++ b/src/main/java/io/papermc/paper/command/brigadier/bukkit/BukkitCommandNode.java @@ -1,6 +1,5 @@ package io.papermc.paper.command.brigadier.bukkit; -import co.aikar.timings.Timing; import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.context.CommandContext; @@ -79,9 +78,6 @@ public class BukkitCommandNode extends LiteralCommandNode { CommandSender sender = context.getSource().getSender(); // Plugins do weird things to workaround normal registration - if (this.command.timings == null) { - //this.command.timings = co.aikar.timings.TimingsManager.getCommandTiming(null, this.command); // Purpur - } String content = context.getRange().get(context.getInput()); String[] args = org.apache.commons.lang3.StringUtils.split(content, ' '); // fix adjacent spaces (from console/plugins) causing empty array elements diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java index 69fbb3ff023db00fb82a1c0235c05afdacb47abd..9d7f21cbd3ecaf5a4da3dceb43b223ff086b245b 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java @@ -1,6 +1,5 @@ package io.papermc.paper.configuration; -import co.aikar.timings.MinecraftTimings; import com.mojang.logging.LogUtils; import io.papermc.paper.configuration.constraint.Constraints; import io.papermc.paper.configuration.type.number.IntOr; @@ -91,28 +90,7 @@ public class GlobalConfiguration extends ConfigurationPart { public boolean useDisplayNameInQuitMessage = false; } - @Deprecated(forRemoval = true) - public Timings timings; - - @Deprecated(forRemoval = true) - public class Timings extends ConfigurationPart { - public boolean enabled = true; - public boolean verbose = true; - public String url = "https://timings.aikar.co/"; - public boolean serverNamePrivacy = false; - public List hiddenConfigEntries = List.of( - "database", - "proxies.velocity.secret" - ); - public int historyInterval = 300; - public int historyLength = 3600; - public String serverName = "Unknown Server"; - - @PostProcess - private void postProcess() { - MinecraftTimings.processConfig(this); - } - } + // DivineMC - Remove timings configuration section public Proxies proxies; diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java index 0e3bed7a75f8f4611f9f44a1f78fd70cc06eaa54..126ed4bd24d993b598c112c2dbfcb9d662038925 100644 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java @@ -1,6 +1,5 @@ package io.papermc.paper.plugin.manager; -import co.aikar.timings.TimedEventExecutor; import com.destroystokyo.paper.event.server.ServerExceptionEvent; import com.destroystokyo.paper.exception.ServerEventException; import com.google.common.collect.Sets; @@ -102,7 +101,6 @@ class PaperEventManager { throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled"); } - executor = new TimedEventExecutor(executor, plugin, null, event); this.getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled)); } @@ -189,7 +187,7 @@ class PaperEventManager { } } - EventExecutor executor = new TimedEventExecutor(EventExecutor.create(method, eventClass), plugin, method, eventClass); + EventExecutor executor = EventExecutor.create(method, eventClass); eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); } return ret; diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java index 097500a59336db1bbfffcd1aa4cff7a8586e46ec..35b00c139864dd7925d46a2d6a317d7e3aae9638 100644 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java @@ -232,7 +232,7 @@ public class PaperPluginManagerImpl implements PluginManager, DependencyContext @Override public boolean useTimings() { - return co.aikar.timings.Timings.isTimingsEnabled(); + return false; } @Override diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java index 0c8fe5b2500480c3a9e9ab3285ad22e0e599d953..f7197f1347251a37dd0f6d9ffa2f09bc3a4e1233 100644 --- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java +++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java @@ -31,8 +31,7 @@ public class PacketUtils { engine.executeIfPossible(() -> { if (listener instanceof ServerCommonPacketListenerImpl serverCommonPacketListener && serverCommonPacketListener.processedDisconnect) return; // CraftBukkit - Don't handle sync packets for kicked players if (listener.shouldHandleMessage(packet)) { - co.aikar.timings.Timing timing = co.aikar.timings.MinecraftTimings.getPacketTiming(packet); // Paper - timings - try { // Paper - timings // Purpur + try { packet.handle(listener); } catch (Exception exception) { if (exception instanceof ReportedException) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 6699b0dadaf7ac49f8c7ec6605bb64472b52361e..3df813c086c2a8dfc29c08cb884c099ee698f412 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -3,7 +3,6 @@ package net.minecraft.server; import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import co.aikar.timings.Timings; import com.destroystokyo.paper.event.server.PaperServerListPingEvent; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; @@ -196,8 +195,6 @@ import org.bukkit.craftbukkit.CraftRegistry; import org.bukkit.event.server.ServerLoadEvent; // CraftBukkit end -import co.aikar.timings.MinecraftTimings; // Paper - public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable, ca.spottedleaf.moonrise.patches.chunk_system.server.ChunkSystemMinecraftServer { // Paper - rewrite chunk system private static MinecraftServer SERVER; // Paper @@ -985,7 +982,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return !this.canOversleep(); }); - //isOversleep = false;MinecraftTimings.serverOversleep.stopTiming(); // Purpur + isOversleep = false; // Paper end new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events @@ -1589,9 +1584,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop waitable = new Waitable<>() { - @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 ConsoleInput serverCommand = new ConsoleInput(event.getCommand(), wrapper); this.server.dispatchServerCommand(event.getSender(), serverCommand); - } // Paper }); // Paper start if (waitableArray[0] != null) { diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java index f5dd325b755beefa159957864ef0d3a381b3af86..f619a698126d60261754e384e523883067a69395 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1,6 +1,5 @@ package net.minecraft.server.level; -import co.aikar.timings.Timing; // Paper import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.Iterables; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java index fa652c9cea66b31c2452ed77cf251791d22f06fb..b38ad3a617b333b2e28981d95deed16f487112c1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1,7 +1,6 @@ package net.minecraft.server.level; import com.google.common.annotations.VisibleForTesting; -import co.aikar.timings.TimingHistory; // Paper import com.google.common.collect.Lists; import com.mojang.datafixers.DataFixer; import com.mojang.datafixers.util.Pair; @@ -1228,9 +1227,8 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf. } public void tickNonPassenger(Entity entity) { - ++TimingHistory.entityTicks; // Paper - timings + //++TimingHistory.entityTicks; // Paper - timings // DivineMC - Delete Timings // Spigot start - co.aikar.timings.Timing timer; // Paper /*if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { // Paper - comment out - EAR 2, reimplement below entity.tickCount++; timer = entity.getType().inactiveTickTimer.startTiming(); try { // Paper - timings @@ -1253,7 +1251,6 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf. });*/ // Purpur //gameprofilerfiller.incrementCounter("tickNonPassenger"); // Purpur if (isActive) { // Paper - EAR 2 - TimingHistory.activatedEntityTicks++; entity.tick(); entity.postTick(); // CraftBukkit } else { entity.inactiveTick(); } // Paper - EAR 2 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java index 10c59d30da3c4713fb7cdcf2e600508c0dd3acf0..969a5461316401950c8fba6ed6347164235a5af9 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1,6 +1,5 @@ package net.minecraft.server.players; -import co.aikar.timings.MinecraftTimings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java index b4f4addfd35a1961a237fc0ab83e6285a0faeaee..bdb70ffc77e763d449f4f550701900b06bd28f39 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java @@ -354,10 +354,6 @@ public class EntityType implements FeatureElement, EntityTypeT this(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnInside, dimensions, spawnBoxScale, maxTrackDistance, trackTickInterval, requiredFeatures, "custom"); } public EntityType(EntityType.EntityFactory factory, MobCategory spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnInside, EntityDimensions dimensions, float spawnBoxScale, int maxTrackDistance, int trackTickInterval, FeatureFlagSet requiredFeatures, String id) { - this.tickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "tick"); - this.inactiveTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "inactiveTick"); - this.passengerTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "passengerTick"); - this.passengerInactiveTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "passengerInactiveTick"); // Paper end this.builtInRegistryHolder = BuiltInRegistries.ENTITY_TYPE.createIntrusiveHolder(this); this.factory = factory; @@ -727,12 +723,6 @@ public class EntityType implements FeatureElement, EntityTypeT return this.updateInterval; } - // Paper start - timings - public final co.aikar.timings.Timing tickTimer; - public final co.aikar.timings.Timing inactiveTickTimer; - public final co.aikar.timings.Timing passengerTickTimer; - public final co.aikar.timings.Timing passengerInactiveTickTimer; - // Paper end public boolean trackDeltas() { return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS; } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java index 6aaee520213e576f131db430bd4d6df1b34ba197..a16ebe81ade583ff45c605e07a11d820557c3e77 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -157,8 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; import org.bukkit.event.player.PlayerItemConsumeEvent; // CraftBukkit end -import co.aikar.timings.MinecraftTimings; // Paper - public abstract class LivingEntity extends Entity implements Attackable { private static final Logger LOGGER = LogUtils.getLogger(); diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java index 612a14806ec63b0dcf31814396282f4b7f4a527c..4ba50f688566f789c7d06cab57fb17cb4fb22760 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java @@ -16,7 +16,6 @@ public abstract class Behavior implements BehaviorContro private final int maxDuration; // Paper start - configurable behavior tick rate and timings private final String configKey; - private final co.aikar.timings.Timing timing; // Paper end - configurable behavior tick rate and timings public Behavior(Map, MemoryStatus> requiredMemoryState) { @@ -38,7 +37,6 @@ public abstract class Behavior implements BehaviorContro key = key.substring(lastSeparator + 1); } this.configKey = key.toLowerCase(java.util.Locale.ROOT); - this.timing = co.aikar.timings.MinecraftTimings.getBehaviorTimings(configKey); // Paper end - configurable behavior tick rate and timings } diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java index 09a7b418ddf564c0be13297f7c216db2e7ae1578..1e26b1099139d76e49fce14ee72061e10bf4dcb9 100644 --- a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java +++ b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java @@ -28,7 +28,6 @@ public abstract class Sensor { private long timeToTick; // Paper start - configurable sensor tick rate and timings private final String configKey; - private final co.aikar.timings.Timing timing; // Paper end public Sensor(int senseInterval) { @@ -39,7 +38,6 @@ public abstract class Sensor { key = key.substring(lastSeparator + 1); } this.configKey = key.toLowerCase(java.util.Locale.ROOT); - this.timing = co.aikar.timings.MinecraftTimings.getSensorTimings(configKey, senseInterval); // Paper end this.scanRate = senseInterval; this.timeToTick = (long)RANDOM.nextInt(senseInterval); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java index 20d9b85fdf6bcf570c97c9bbf9787918d81cc9be..37f63cb756030f41f3d6f535469c0c6b8cc862cb 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -175,7 +175,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur public final DivineWorldConfig divinemcConfig; // DivineMC - public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPos lastPhysicsProblem; // Spigot private int tileTickPosition; public final Map explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions @@ -384,7 +383,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl public void onBorderSetDamageSafeZOne(WorldBorder border, double safeZoneRadius) {} }); // CraftBukkit end - this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings this.entityLookup = new ca.spottedleaf.moonrise.patches.chunk_system.level.entity.dfl.DefaultEntityLookup(this); // Paper - rewrite chunk system this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray } @@ -1016,9 +1014,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl } this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075 - //this.timings.tileEntityTick.stopTiming(); // Spigot // Purpur this.tickingBlockEntities = false; - co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper //gameprofilerfiller.pop(); // Purpur this.spigotConfig.currentPrimedTnt = 0; // Spigot } diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java index daad0d67428bb49d7f0b37bec430ceb0d30564cf..df17fcc62049c2527ab31afbb14e582009f486c8 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java @@ -106,13 +106,6 @@ public class Block extends BlockBehaviour implements ItemLike { this != Blocks.STRUCTURE_BLOCK && this != Blocks.JIGSAW; } - public co.aikar.timings.Timing timing; - public co.aikar.timings.Timing getTiming() { - if (timing == null) { - timing = co.aikar.timings.MinecraftTimings.getBlockTiming(this); - } - return timing; - } // Paper end @Nullable private String descriptionId; diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java index cd0e43f4c53a746dd6183a8406269f9b11ad3571..54657ac895fb2fa9c58910d5421f0082d140cfed 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java @@ -33,14 +33,9 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry; import org.bukkit.inventory.InventoryHolder; // CraftBukkit end -import org.spigotmc.CustomTimingsHandler; // Spigot -import co.aikar.timings.MinecraftTimings; // Paper -import co.aikar.timings.Timing; // Paper - public abstract class BlockEntity { static boolean ignoreTileUpdates; // Paper - Perf: Optimize Hoppers - public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper // CraftBukkit start - data containers private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry(); public CraftPersistentDataContainer persistentDataContainer; diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java index e68e13ac375a6418ad0785bc1c0f20af72bf6cf5..e51a9ec41054750c38f95b06881980842c2c57f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -1,6 +1,5 @@ package org.bukkit.craftbukkit.scheduler; -import co.aikar.timings.MinecraftTimings; // Paper import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.util.ArrayList; @@ -304,7 +303,7 @@ public class CraftScheduler implements BukkitScheduler { } return false; } - }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer();}}; // Paper + }); this.handle(task, 0L); for (CraftTask taskPending = this.head.getNext(); taskPending != null; taskPending = taskPending.getNext()) { if (taskPending == task) { @@ -344,7 +343,7 @@ public class CraftScheduler implements BukkitScheduler { } } } - }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer(plugin);}}; // Paper + }); // Paper this.handle(task, 0L); for (CraftTask taskPending = this.head.getNext(); taskPending != null; taskPending = taskPending.getNext()) { if (taskPending == task) { diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java index 5835dc236b3f5291a804f7fb14a12eb466d4e0ba..a6dc7679602df92cd3f825c5727b58ce759e9554 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java @@ -2,15 +2,10 @@ package org.bukkit.craftbukkit.scheduler; import java.util.function.Consumer; -import co.aikar.timings.NullTimingHandler; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitTask; -import org.spigotmc.CustomTimingsHandler; // Spigot -import co.aikar.timings.MinecraftTimings; // Paper -import co.aikar.timings.Timing; // Paper - public class CraftTask implements BukkitTask, Runnable { // Spigot private volatile CraftTask next = null; @@ -31,7 +26,6 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot private long nextRun; public final Runnable rTask; // Paper public final Consumer cTask; // Paper - public Timing timings; // Paper private final Plugin plugin; private final int id; private final long createdAt = System.nanoTime(); @@ -55,7 +49,6 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot this.id = id; this.period = CraftTask.NO_REPEATING; this.taskName = taskName; - this.timings = MinecraftTimings.getInternalTaskName(taskName); } // Paper end @@ -76,7 +69,6 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot } this.id = id; this.period = period; - timings = task != null ? MinecraftTimings.getPluginTaskTimings(this, period) : NullTimingHandler.NULL; // Paper } @Override diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java index d3ec817e95628f1fc8be4a29c9a0f13c7d5fd552..e9798517b9211c50a20ea5c69603aab35f614f02 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java @@ -115,16 +115,9 @@ public final class CraftScoreboardManager implements ScoreboardManager { public void forAllObjectives(ObjectiveCriteria criteria, ScoreHolder holder, Consumer consumer) { // Paper start - add timings for scoreboard search // plugins leaking scoreboards will make this very expensive, let server owners debug it easily - //co.aikar.timings.MinecraftTimings.scoreboardScoreSearch.startTimingIfSync(); // Purpur - try { - // Paper end - add timings for scoreboard search for (CraftScoreboard scoreboard : this.scoreboards) { Scoreboard board = scoreboard.board; board.forAllObjectives(criteria, holder, (score) -> consumer.accept(score)); } - } finally { // Paper start - add timings for scoreboard search - //co.aikar.timings.MinecraftTimings.scoreboardScoreSearch.stopTimingIfSync(); // Purpur - } - // Paper end - add timings for scoreboard search } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java index aa38e21c30ae104e0f775bd29da4a49366d009f8..9a58c155ba65e905e85b0df02fb5c29b3a26f670 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -220,7 +220,7 @@ public final class CraftMagicNumbers implements UnsafeValues { // Paper start @Override public void reportTimings() { - co.aikar.timings.TimingsExport.reportTimings(); + } // Paper end @@ -499,7 +499,7 @@ public final class CraftMagicNumbers implements UnsafeValues { // Paper start @Override public String getTimingsServerName() { - return io.papermc.paper.configuration.GlobalConfiguration.get().timings.serverName; + return "Unknown Server"; // DivineMC - strict assignment of the server name to an unknown } @Override diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java index 1e8100be8d443d43e99e0c5f777e20872f6e1a7f..fd8e534a790b622d83aeac8e198d06a374a6a1c2 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -34,7 +34,6 @@ import net.minecraft.world.entity.projectile.FireworkRocketEntity; import net.minecraft.world.entity.projectile.ThrowableProjectile; import net.minecraft.world.entity.projectile.ThrownTrident; import net.minecraft.world.entity.raid.Raider; -import co.aikar.timings.MinecraftTimings; import net.minecraft.world.entity.schedule.Activity; import net.minecraft.world.level.Level; import net.minecraft.world.phys.AABB;