From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sat, 23 Sep 2023 03:12:14 -0400 Subject: [PATCH] Remove Timings Completely remove the Timings, since it wastes too much performance. Use Spark instead. 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 4b467f1af93452d13829f756d55dee18b8889d40..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ /dev/null @@ -1,181 +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 - public static final Timing distanceManagerTick = Timings.ofSafe("Distance Manager Tick"); // Paper - add timings for distance manager - - public static final Timing midTickChunkTasks = Timings.ofSafe("Mid Tick Chunk Tasks"); - - 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 429cff43a9f0c74161fdab857f5d45771f774ac2..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ /dev/null @@ -1,450 +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.galemc.gale.configuration.GaleGlobalConfiguration; -import org.galemc.gale.configuration.timingsexport.VanillaServerPropertiesTimingsExport; -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.Arrays; -import java.util.LinkedHashMap; -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(); - - // Gale start - include hardware specs in timings - var processor = hardwareInfo.getProcessor(); - var processorIdentifier = processor.getProcessorIdentifier(); - var memory = hardwareInfo.getMemory(); - - Map hardwareSpecsMap = new LinkedHashMap<>(); - if (GaleGlobalConfiguration.get().misc.includeInTimingsReport.hardwareSpecs.cpu) { - hardwareSpecsMap.put("cpu", createObject( - pair("logicalprocessorcount", processor.getLogicalProcessorCount()), - pair("physicalprocessorcount", processor.getPhysicalProcessorCount()), - pair("physicalpackagecount", processor.getPhysicalPackageCount()), - pair("contextswitches", processor.getContextSwitches()), - pair("interrupts", processor.getInterrupts()), - pair("maxfreq", processor.getMaxFreq()), - pair("currentfreq", Arrays.toString(processor.getCurrentFreq())), - pair("identifier", createObject( - pair("vendor", String.valueOf(processorIdentifier.getVendor()).trim()), - pair("name", String.valueOf(processorIdentifier.getName()).trim()), - pair("family", String.valueOf(processorIdentifier.getFamily()).trim()), - pair("model", String.valueOf(processorIdentifier.getModel()).trim()), - pair("vendor", String.valueOf(processorIdentifier.getVendor()).trim()), - pair("cpu64bit", processorIdentifier.isCpu64bit()), - pair("vendorfreq", processorIdentifier.getVendorFreq()), - pair("microarchitecture", String.valueOf(processorIdentifier.getMicroarchitecture()).trim()) - )) - )); - } - if (GaleGlobalConfiguration.get().misc.includeInTimingsReport.hardwareSpecs.disks) { - hardwareSpecsMap.put("diskstores", toArrayMapper(hardwareInfo.getDiskStores(), disk -> createObject( - pair("name", String.valueOf(disk.getName()).trim()), - pair("model", String.valueOf(disk.getModel()).trim()), - pair("serial", String.valueOf(disk.getSerial()).trim()), - pair("size", disk.getSize()) - ))); - } - if (GaleGlobalConfiguration.get().misc.includeInTimingsReport.hardwareSpecs.gpus) { - hardwareSpecsMap.put("gpus", toArrayMapper(hardwareInfo.getGraphicsCards(), gpu -> createObject( - pair("name", String.valueOf(gpu.getName()).trim()), - pair("deviceid", String.valueOf(gpu.getDeviceId()).trim()), - pair("vendor", String.valueOf(gpu.getVendor()).trim()), - pair("versioninfo", String.valueOf(gpu.getVersionInfo()).trim()), - pair("vram", gpu.getVRam()) - ))); - } - if (GaleGlobalConfiguration.get().misc.includeInTimingsReport.hardwareSpecs.memory) { - hardwareSpecsMap.put("memory", createObject( - pair("total", memory.getTotal()), - pair("available", memory.getAvailable()), - pair("pagesize", memory.getPageSize()) - )); - } - // Gale end - include hardware specs in timings - - 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("hardwarespecs", hardwareSpecsMap), // Gale - include hardware specs in timings - 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("server.properties", VanillaServerPropertiesTimingsExport.get()), // Gale - include server.properties in timings - pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)), - pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)), - // Gale start - Gale configuration - include in timings - pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), - pair("gale", mapAsJSON(Bukkit.spigot().getGaleConfig(), null)) - // Gale end - Gale configuration - include in timings - )); - - 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; - } - - public static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) { // Gale - Gale configuration - - 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 22687667ec69a954261e55e59261286ac1b8b8cd..0000000000000000000000000000000000000000 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java +++ /dev/null @@ -1,140 +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 final Timing poiUnload; - public final Timing chunkUnload; - public final Timing poiSaveDataSerialization; - public final Timing chunkSave; - public final Timing chunkSaveDataSerialization; - public final Timing chunkSaveIOWait; - public final Timing chunkUnloadPrepareSave; - public final Timing chunkUnloadPOISerialization; - public final Timing chunkUnloadDataSave; - - 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"); - - poiUnload = Timings.ofSafe(name + "Chunk unload - POI"); - chunkUnload = Timings.ofSafe(name + "Chunk unload - Chunk"); - poiSaveDataSerialization = Timings.ofSafe(name + "Chunk save - POI Data serialization"); - chunkSave = Timings.ofSafe(name + "Chunk save - Chunk"); - chunkSaveDataSerialization = Timings.ofSafe(name + "Chunk save - Chunk Data serialization"); - chunkSaveIOWait = Timings.ofSafe(name + "Chunk save - Chunk IO Wait"); - chunkUnloadPrepareSave = Timings.ofSafe(name + "Chunk unload - Async Save Prepare"); - chunkUnloadPOISerialization = Timings.ofSafe(name + "Chunk unload - POI Data Serialization"); - chunkUnloadDataSave = Timings.ofSafe(name + "Chunk unload - Data Serialization"); - } - - 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/chunk/system/scheduling/ChunkHolderManager.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java index 6bc7c6f16a1649fc9e24e7cf90fca401e5bd4875..5b446e6ac151f99f64f0c442d0b40b5e251bc4c4 100644 --- a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java +++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkHolderManager.java @@ -1316,9 +1316,7 @@ public final class ChunkHolderManager { } public boolean processTicketUpdates() { - co.aikar.timings.MinecraftTimings.distanceManagerTick.startTiming(); try { // Paper - add timings for distance manager return this.processTicketUpdates(true, true, null); - } finally { co.aikar.timings.MinecraftTimings.distanceManagerTick.stopTiming(); } // Paper - add timings for distance manager } private static final ThreadLocal> CURRENT_TICKET_UPDATE_SCHEDULING = new ThreadLocal<>(); diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java index b66a7d4aab887309579154815a0d4abf9de506b0..78cb9d7da9bb025ea362028fdc9d0317de95959e 100644 --- a/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java +++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java @@ -1779,7 +1779,6 @@ public final class NewChunkHolder { boolean canSavePOI = !(chunk instanceof LevelChunk levelChunk && levelChunk.mustNotSave) && (poi != null && poi.isDirty()); boolean canSaveEntities = entities != null; - try (co.aikar.timings.Timing ignored = this.world.timings.chunkSave.startTiming()) { // Paper if (canSaveChunk) { canSaveChunk = this.saveChunk(chunk, unloading); } @@ -1793,7 +1792,6 @@ public final class NewChunkHolder { this.lastEntityUnload = null; } } - } return executedUnloadTask | canSaveChunk | canSaveEntities | canSavePOI ? new SaveStat(executedUnloadTask || canSaveChunk, canSaveEntities, canSavePOI): null; } diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java index 65a51d934a98fd296fd41482c4201b974305dadc..31f200a30cbaa37e6167d3e162cc3f5195af392e 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java @@ -1,7 +1,7 @@ package io.papermc.paper.configuration; -import co.aikar.timings.MinecraftTimings; import com.mojang.logging.LogUtils; +import io.papermc.paper.configuration.constraint.Constraint; import io.papermc.paper.configuration.constraint.Constraints; import io.papermc.paper.configuration.type.number.IntOr; import net.kyori.adventure.text.Component; @@ -90,39 +90,6 @@ public class GlobalConfiguration extends ConfigurationPart { public boolean useDisplayNameInQuitMessage = false; } - @Deprecated(forRemoval = true) - public Timings timings; - - @Deprecated(forRemoval = true) - public class Timings extends ConfigurationPart { - // Gale start - recommend disabling timings on startup - public boolean enabled = false; // Gale - set default value to false - public boolean warnIfEnabled = true; - // Gale end - recommend disabling timings on startup - public boolean verbose = true; - public String url = "https://timin.gs/"; // Gale - use timin.gs by default - 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() { - // Gale start - recommend disabling timings on startup - if (enabled && warnIfEnabled) { - net.minecraft.server.MinecraftServer.LOGGER.warn("To improve performance, we recommend setting timings.enabled to false in paper-global.yml"); - net.minecraft.server.MinecraftServer.LOGGER.warn("(If you do this, timings will not start on server startup, but you can still start timings later by using /timings on)"); - net.minecraft.server.MinecraftServer.LOGGER.warn("If you would like to disable this message, set timings.warn-if-enabled to false in paper-global.yml."); - } - // Gale end - recommend disabling timings on startup - MinecraftTimings.processConfig(this); - } - } - public Proxies proxies; public class Proxies extends ConfigurationPart { 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 7ce9ebba8ce304d1f3f21d4f15ee5f3560d7700b..a1c9726d25479b5326fe2fa2b0f5a98d6b2da4c5 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; @@ -95,7 +94,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)); } @@ -182,7 +180,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 dab211c458311869c61779305580a1c7da830f71..0ddcf3652a2cc9e0cc28f672f103ec7e271fc1fb 100644 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java @@ -227,7 +227,7 @@ public class PaperPluginManagerImpl implements PluginManager, DependencyContext @Override public boolean useTimings() { - return co.aikar.timings.Timings.isTimingsEnabled(); + return false; // Leaf - Remove Timings } @Override diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java index 3e2d5dcd62775b6ed7c0ce0ba51a71b635b1d644..deca974c2a82bc341fe23ea46f61f42f04432755 100644 --- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java +++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java @@ -49,8 +49,8 @@ public class PacketUtils { try { // Paper - detailed watchdog information if (MinecraftServer.getServer().hasStopped() || (listener instanceof ServerCommonPacketListenerImpl && ((ServerCommonPacketListenerImpl) listener).processedDisconnect)) return; // CraftBukkit, MC-142590 if (listener.shouldHandleMessage(packet)) { - co.aikar.timings.Timing timing = co.aikar.timings.MinecraftTimings.getPacketTiming(packet); // Paper - timings - try (co.aikar.timings.Timing ignored = timing.startTiming()) { // Paper - timings + + try { packet.handle(listener); } catch (Exception exception) { label25: diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 16d3fc610fc15da85f3b0652e835d196c010c89d..86bb3df2915495387c43cf425e3183682c9e0344 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -178,8 +178,6 @@ import org.bukkit.craftbukkit.Main; import org.bukkit.event.server.ServerLoadEvent; // CraftBukkit end -import co.aikar.timings.MinecraftTimings; // Paper - public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements ServerInfo, CommandSource, AutoCloseable { public static final int SERVER_THREAD_PRIORITY = Integer.getInteger("gale.thread.priority.server", -1); // Gale - server thread priority environment variable @@ -959,7 +957,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return !this.canSleepForTickNoOversleep(); // Paper - move oversleep into full server tick @@ -1409,8 +1406,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { return !this.canOversleep(); }); - isOversleep = false;MinecraftTimings.serverOversleep.stopTiming(); + isOversleep = false; // Paper end new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events @@ -1552,11 +1543,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { entityplayer.connection.suspendFlushing(); }); - MinecraftTimings.bukkitSchedulerTimer.startTiming(); // Spigot // Paper this.server.getScheduler().mainThreadHeartbeat(this.tickCount); // CraftBukkit - MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper // Paper start - Folia scheduler API ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick(); getAllLevels().forEach(level -> { @@ -1658,20 +1641,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Purpur @@ -1711,14 +1688,12 @@ 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 de511a1d43aa78ec79c12d78635175336f77b62c..546028b42544bd62578e415faa245559a373a289 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; @@ -538,13 +537,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } protected void tick(BooleanSupplier shouldKeepTicking) { - try (Timing ignored = this.level.timings.poiUnload.startTiming()) { // Paper this.poiManager.tick(shouldKeepTicking); - } // Paper if (!this.level.noSave()) { - try (Timing ignored = this.level.timings.chunkUnload.startTiming()) { // Paper this.processUnloads(shouldKeepTicking); - } // Paper } } @@ -1135,25 +1130,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider // Paper start - optimised tracker private final void processTrackQueue() { - this.level.timings.tracker1.startTiming(); - try { for (TrackedEntity tracker : this.entityMap.values()) { // update tracker entry tracker.updatePlayers(tracker.entity.getPlayersInTrackRange()); } - } finally { - this.level.timings.tracker1.stopTiming(); - } - - this.level.timings.tracker2.startTiming(); - try { for (TrackedEntity tracker : this.entityMap.values()) { tracker.serverEntity.sendChanges(); } - } finally { - this.level.timings.tracker2.stopTiming(); - } } // Paper end - optimised tracker @@ -1167,7 +1151,6 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider List list = Lists.newArrayList(); List list1 = this.level.players(); ObjectIterator objectiterator = this.entityMap.values().iterator(); - level.timings.tracker1.startTiming(); // Paper ChunkMap.TrackedEntity playerchunkmap_entitytracker; @@ -1192,17 +1175,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider playerchunkmap_entitytracker.serverEntity.sendChanges(); } } - level.timings.tracker1.stopTiming(); // Paper if (!list.isEmpty()) { objectiterator = this.entityMap.values().iterator(); - level.timings.tracker2.startTiming(); // Paper while (objectiterator.hasNext()) { playerchunkmap_entitytracker = (ChunkMap.TrackedEntity) objectiterator.next(); playerchunkmap_entitytracker.updatePlayers(list); } - level.timings.tracker2.stopTiming(); // Paper } } diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java index 6587ce30d88983cb42822e6ff3e012047d3ce16d..93ec0bdece165e5a5058f9a7ed2fd67dbcef2ab4 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -276,10 +276,8 @@ public class ServerChunkCache extends ChunkSource { if (!completablefuture.isDone()) { // Paper io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.pushChunkWait(this.level, x1, z1); // Paper - rewrite chunk system com.destroystokyo.paper.io.SyncLoadFinder.logSyncLoad(this.level, x, z); // Paper - Add debug for sync chunk loads - this.level.timings.syncChunkLoad.startTiming(); // Paper chunkproviderserver_b.managedBlock(completablefuture::isDone); io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.popChunkWait(); // Paper - rewrite chunk system - this.level.timings.syncChunkLoad.stopTiming(); // Paper } // Paper ichunkaccess = (ChunkAccess) ((Either) completablefuture.join()).map((ichunkaccess1) -> { return ichunkaccess1; @@ -428,17 +426,13 @@ public class ServerChunkCache extends ChunkSource { public void save(boolean flush) { this.runDistanceManagerUpdates(); - try (co.aikar.timings.Timing timed = level.timings.chunkSaveData.startTiming()) { // Paper - Timings this.chunkMap.saveAllChunks(flush); - } // Paper - Timings } // Paper start - Incremental chunk and player saving; duplicate save, but call incremental public void saveIncrementally() { this.runDistanceManagerUpdates(); - try (co.aikar.timings.Timing timed = level.timings.chunkSaveData.startTiming()) { // Paper - Timings this.chunkMap.saveIncrementally(); - } // Paper - Timings } // Paper end - Incremental chunk and player saving @@ -471,21 +465,15 @@ public class ServerChunkCache extends ChunkSource { @Override public void tick(BooleanSupplier shouldKeepTicking, boolean tickChunks) { - this.level.timings.doChunkMap.startTiming(); // Spigot this.distanceManager.purgeStaleTickets(); this.runDistanceManagerUpdates(); - this.level.timings.doChunkMap.stopTiming(); // Spigot if (tickChunks) { - this.level.timings.chunks.startTiming(); // Paper - timings this.chunkMap.level.playerChunkLoader.tick(); // Paper - replace player chunk loader - this is mostly required to account for view distance changes this.tickChunks(); - this.level.timings.chunks.stopTiming(); // Paper - timings this.chunkMap.tick(); } - this.level.timings.doChunkUnload.startTiming(); // Spigot this.chunkMap.tick(shouldKeepTicking); - this.level.timings.doChunkUnload.stopTiming(); // Spigot this.clearCache(); } @@ -495,8 +483,6 @@ public class ServerChunkCache extends ChunkSource { this.lastInhabitedUpdate = i; if (!this.level.isDebug()) { - // Paper - optimise chunk tick iteration - if (this.level.getServer().tickRateManager().runsNormally()) this.level.timings.chunkTicks.startTiming(); // Paper // Paper - optimise chunk tick iteration @@ -508,7 +494,6 @@ public class ServerChunkCache extends ChunkSource { boolean flagAndHasNaturalSpawn = flag && this.anySpawnCategoryIsSpawnedThisTick(); if (flagAndHasNaturalSpawn) { // Gale end - MultiPaper - skip unnecessary mob spawning computations - this.level.timings.countNaturalMobs.startTiming(); // Paper - timings int k = this.distanceManager.getNaturalSpawnChunkCount(); // Paper start - Optional per player mob spawns int naturalSpawnChunkCount = k; @@ -537,7 +522,6 @@ public class ServerChunkCache extends ChunkSource { // Pufferfish end } // Paper end - Optional per player mob spawns - this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings //this.lastSpawnState = spawnercreature_d; // Pufferfish - this is managed asynchronously // Gale start - MultiPaper - skip unnecessary mob spawning computations @@ -649,17 +633,13 @@ public class ServerChunkCache extends ChunkSource { } } // Paper end - optimise chunk tick iteration - this.level.timings.chunkTicks.stopTiming(); // Paper if (flag) { - try (co.aikar.timings.Timing ignored = this.level.timings.miscMobSpawning.startTiming()) { // Paper - timings this.level.tickCustomSpawners(this.spawnEnemies, this.spawnFriendlies); - } // Paper - timings } } // Paper - optimise chunk tick iteration - this.level.timings.broadcastChunkUpdates.startTiming(); // Paper - timing // Paper start - optimise chunk tick iteration if (!this.chunkMap.needsChangeBroadcasting.isEmpty()) { it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet copy = this.chunkMap.needsChangeBroadcasting.clone(); @@ -673,7 +653,6 @@ public class ServerChunkCache extends ChunkSource { } } // Paper end - optimise chunk tick iteration - this.level.timings.broadcastChunkUpdates.stopTiming(); // Paper - timing // Paper - optimise chunk tick iteration } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java index 0c376236d0cbc6033865f25db592c42a0d3d30d7..165b9f9ede6eec3e5667a2e653988f0e69ddb09f 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; @@ -862,27 +861,19 @@ public class ServerLevel extends Level implements WorldGenLevel { this.tickTime(); } - this.timings.scheduledBlocks.startTiming(); // Paper if (!this.isDebug() && flag) { j = this.getGameTime(); this.blockTicks.tick(j, paperConfig().environment.maxBlockTicks, this::tickBlock); // Paper - configurable max block ticks this.fluidTicks.tick(j, paperConfig().environment.maxFluidTicks, this::tickFluid); // Paper - configurable max fluid ticks } - this.timings.scheduledBlocks.stopTiming(); // Paper if (flag) { - this.timings.raids.startTiming(); // Paper - timings this.raids.tick(); - this.timings.raids.stopTiming(); // Paper - timings } - this.timings.chunkProviderTick.startTiming(); // Paper - timings this.getChunkSource().tick(shouldKeepTicking, true); - this.timings.chunkProviderTick.stopTiming(); // Paper - timings if (flag) { - this.timings.doSounds.startTiming(); // Spigot this.runBlockEvents(); - this.timings.doSounds.stopTiming(); // Spigot } this.handlingTick = false; @@ -893,13 +884,11 @@ public class ServerLevel extends Level implements WorldGenLevel { } if (flag1 || this.emptyTime++ < 300) { - this.timings.tickEntities.startTiming(); // Spigot if (this.dragonFight != null && flag) { this.dragonFight.tick(); } org.spigotmc.ActivationRange.activateEntities(this); // Spigot - this.timings.entityTick.startTiming(); // Spigot this.entityTickList.forEach((entity) -> { entity.activatedPriorityReset = false; // Pufferfish - DAB if (!entity.isRemoved()) { @@ -936,8 +925,6 @@ public class ServerLevel extends Level implements WorldGenLevel { } } }); - this.timings.entityTick.stopTiming(); // Spigot - this.timings.tickEntities.stopTiming(); // Spigot this.tickBlockEntities(); } @@ -1071,7 +1058,6 @@ public class ServerLevel extends Level implements WorldGenLevel { } } // Paper - Option to disable ice and snow - timings.chunkTicksBlocks.startTiming(); // Paper if (randomTickSpeed > 0) { // Paper start - optimize random block ticking LevelChunkSection[] sections = chunk.getSections(); @@ -1104,8 +1090,6 @@ public class ServerLevel extends Level implements WorldGenLevel { } } // Paper end - optimise random block ticking - - timings.chunkTicksBlocks.stopTiming(); // Paper } @VisibleForTesting @@ -1435,31 +1419,21 @@ public class ServerLevel extends Level implements WorldGenLevel { currentlyTickingEntity.lazySet(entity); } // Paper end - log detailed entity tick information - ++TimingHistory.entityTicks; // Paper - 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 entity.inactiveTick(); - } finally { timer.stopTiming(); } // Paper return; }*/ // Paper - comment out EAR 2 // Spigot end - // Paper start- timings final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(entity); - timer = isActive ? entity.getType().tickTimer.startTiming() : entity.getType().inactiveTickTimer.startTiming(); // Paper - try { - // Paper end - timings entity.setOldPosAndRot(); ++entity.tickCount; if (isActive) { // Paper - EAR 2 - TimingHistory.activatedEntityTicks++; entity.tick(); entity.postTick(); // CraftBukkit } else { entity.inactiveTick(); } // Paper - EAR 2 - } finally { timer.stopTiming(); } // Paper - timings Iterator iterator = entity.getPassengers().iterator(); while (iterator.hasNext()) { @@ -1467,7 +1441,6 @@ public class ServerLevel extends Level implements WorldGenLevel { this.tickPassenger(entity, entity1); } - // } finally { timer.stopTiming(); } // Paper - timings - move up // Paper start - log detailed entity tick information } finally { if (currentlyTickingEntity.get() == entity) { @@ -1482,9 +1455,6 @@ public class ServerLevel extends Level implements WorldGenLevel { if (passenger instanceof Player || this.entityTickList.contains(passenger)) { // Paper - EAR 2 final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(passenger); - co.aikar.timings.Timing timer = isActive ? passenger.getType().passengerTickTimer.startTiming() : passenger.getType().passengerInactiveTickTimer.startTiming(); // Paper - try { - // Paper end passenger.setOldPosAndRot(); ++passenger.tickCount; // Paper start - EAR 2 @@ -1505,8 +1475,6 @@ public class ServerLevel extends Level implements WorldGenLevel { this.tickPassenger(passenger, entity2); } - - } finally { timer.stopTiming(); }// Paper - EAR2 timings } } else { passenger.stopRiding(); @@ -1526,14 +1494,11 @@ public class ServerLevel extends Level implements WorldGenLevel { org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); } - try (co.aikar.timings.Timing ignored = this.timings.worldSave.startTiming()) { if (doFull) { this.saveLevelData(true); // Paper - Write SavedData IO async } - this.timings.worldSaveChunks.startTiming(); // Paper if (!this.noSave()) chunkproviderserver.saveIncrementally(); - this.timings.worldSaveChunks.stopTiming(); // Paper // Copied from save() // CraftBukkit start - moved from MinecraftServer.saveChunks @@ -1545,7 +1510,6 @@ public class ServerLevel extends Level implements WorldGenLevel { this.convertable.saveDataTag(this.server.registryAccess(), this.serverLevelData, this.server.getPlayerList().getSingleplayerData()); } // CraftBukkit end - } } // Paper end - Incremental chunk and player saving @@ -1559,7 +1523,6 @@ public class ServerLevel extends Level implements WorldGenLevel { if (!savingDisabled) { org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(this.getWorld())); // CraftBukkit - try (co.aikar.timings.Timing ignored = timings.worldSave.startTiming()) { // Paper if (progressListener != null) { progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel")); } @@ -1569,11 +1532,8 @@ public class ServerLevel extends Level implements WorldGenLevel { progressListener.progressStage(Component.translatable("menu.savingChunks")); } - timings.worldSaveChunks.startTiming(); // Paper if (!close) chunkproviderserver.save(flush); // Paper - rewrite chunk system if (close) chunkproviderserver.close(true); // Paper - rewrite chunk system - timings.worldSaveChunks.stopTiming(); // Paper - }// Paper // Paper - rewrite chunk system - entity saving moved into ChunkHolder } else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java index fc57aad909a843a7ebd8490f125b424872f71ed5..ac9a2b8ba9f7a858b356296296d7424c451b69fe 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2483,7 +2483,6 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl public void handleCommand(String s) { // Paper - private -> public org.spigotmc.AsyncCatcher.catchOp("Command Dispatched Async: " + s); // Paper - Add async catcher - co.aikar.timings.MinecraftTimings.playerCommandTimer.startTiming(); // Paper if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s); @@ -2493,7 +2492,6 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.cserver.getPluginManager().callEvent(event); if (event.isCancelled()) { - co.aikar.timings.MinecraftTimings.playerCommandTimer.stopTiming(); // Paper return; } @@ -2505,8 +2503,6 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl player.sendMessage(org.bukkit.ChatColor.RED + "An internal error occurred while attempting to perform this command"); java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); return; - } finally { - co.aikar.timings.MinecraftTimings.playerCommandTimer.stopTiming(); // Paper } } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java index 3c6002e33d1b86b60ccfa11ef615aa8f7adaf81b..7d98ba26ccde1e57378253e03c437650051f7843 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; @@ -1338,7 +1337,6 @@ public abstract class PlayerList { public void saveAll(int interval) { io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main - MinecraftTimings.savePlayers.startTiming(); // Paper int numSaved = 0; long now = MinecraftServer.currentTick; for (int i = 0; i < this.players.size(); ++i) { @@ -1349,7 +1347,6 @@ public abstract class PlayerList { } // Paper end - Incremental chunk and player saving } - MinecraftTimings.savePlayers.stopTiming(); // Paper return null; }); // Paper - ensure main } diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java index a9e2a758669550530eb29475ba99fe42e520f6ae..d617e803f47219621b6b3b42c3bb7f30eb6cb805 100644 --- a/src/main/java/net/minecraft/world/entity/EntityType.java +++ b/src/main/java/net/minecraft/world/entity/EntityType.java @@ -340,15 +340,6 @@ public class EntityType implements FeatureElement, EntityTypeT } public EntityType(EntityType.EntityFactory factory, MobCategory spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnInside, EntityDimensions dimensions, int maxTrackDistance, int trackTickInterval, FeatureFlagSet requiredFeatures) { - // Paper start - this(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnInside, dimensions, maxTrackDistance, trackTickInterval, requiredFeatures, "custom"); - } - public EntityType(EntityType.EntityFactory factory, MobCategory spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnInside, EntityDimensions dimensions, 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; this.category = spawnGroup; @@ -720,12 +711,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; } @@ -835,7 +820,7 @@ public class EntityType implements FeatureElement, EntityTypeT Util.fetchChoiceType(References.ENTITY_TREE, id); } - return new EntityType<>(this.factory, this.category, this.serialize, this.summon, this.fireImmune, this.canSpawnFarFromPlayer, this.immuneTo, this.dimensions, this.clientTrackingRange, this.updateInterval, this.requiredFeatures, id); // Paper - add id + return new EntityType<>(this.factory, this.category, this.serialize, this.summon, this.fireImmune, this.canSpawnFarFromPlayer, this.immuneTo, this.dimensions, this.clientTrackingRange, this.updateInterval, this.requiredFeatures); } } 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 1e71cde7cb7654f1c21ae5e27e2fad7b58f593eb..358415f32a40b355f7bf397f2e197eca726547ec 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 @@ -13,9 +13,8 @@ public abstract class Behavior implements BehaviorContro private long endTimestamp; private final int minDuration; private final int maxDuration; - // Paper start - configurable behavior tick rate and timings + // Paper start - configurable behavior tick rate private final String configKey; - private final co.aikar.timings.Timing timing; // Paper end - configurable behavior tick rate and timings public Behavior(Map, MemoryStatus> requiredMemoryState) { @@ -30,14 +29,13 @@ public abstract class Behavior implements BehaviorContro this.minDuration = minRunTime; this.maxDuration = maxRunTime; this.entryCondition = requiredMemoryState; - // Paper start - configurable behavior tick rate and timings + // Paper start - configurable behavior tick rate String key = io.papermc.paper.util.ObfHelper.INSTANCE.deobfClassName(this.getClass().getName()); int lastSeparator = key.lastIndexOf('.'); if (lastSeparator != -1) { 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 } @@ -58,9 +56,7 @@ public abstract class Behavior implements BehaviorContro this.status = Behavior.Status.RUNNING; int i = this.minDuration + world.getRandom().nextInt(this.maxDuration + 1 - this.minDuration); this.endTimestamp = time + (long)i; - this.timing.startTiming(); // Paper - behavior timings this.start(world, entity, time); - this.timing.stopTiming(); // Paper - behavior timings return true; } else { return false; @@ -72,14 +68,11 @@ public abstract class Behavior implements BehaviorContro @Override public final void tickOrStop(ServerLevel world, E entity, long time) { - this.timing.startTiming(); // Paper - behavior timings if (!this.timedOut(time) && this.canStillUse(world, entity, time)) { this.tick(world, entity, time); } else { this.doStop(world, entity, time); } - this.timing.stopTiming(); // Paper - behavior timings - } protected void tick(ServerLevel world, E entity, long time) { 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 fcdb9bde8e1605e30dde3e580491522d4b62cdc0..4de18d00cc464313b777874430da3f5595f9c202 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 @@ -19,20 +19,18 @@ public abstract class Sensor { private static final TargetingConditions ATTACK_TARGET_CONDITIONS_IGNORE_INVISIBILITY_AND_LINE_OF_SIGHT = TargetingConditions.forCombat().range(16.0D).ignoreLineOfSight().ignoreInvisibilityTesting(); private final int scanRate; private long timeToTick; - // Paper start - configurable sensor tick rate and timings + // Paper start - configurable sensor tick rate private final String configKey; - private final co.aikar.timings.Timing timing; // Paper end public Sensor(int senseInterval) { - // Paper start - configurable sensor tick rate and timings + // Paper start - configurable sensor tick rate String key = io.papermc.paper.util.ObfHelper.INSTANCE.deobfClassName(this.getClass().getName()); int lastSeparator = key.lastIndexOf('.'); if (lastSeparator != -1) { 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); @@ -44,12 +42,10 @@ public abstract class Sensor { public final void tick(ServerLevel world, E entity) { if (--this.timeToTick <= 0L) { - // Paper start - configurable sensor tick rate and timings + // Paper start - configurable sensor tick rate this.timeToTick = java.util.Objects.requireNonNullElse(world.paperConfig().tickRates.sensor.get(entity.getType(), this.configKey), this.scanRate); - this.timing.startTiming(); // Paper end this.doTick(world, entity); - this.timing.stopTiming(); // Paper - sensor timings } } diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java index 7583ce583b06306930cbae49b0386a6630bb916f..ff05efe0b78defe3d25905b6a2984bdb646fcff3 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -176,7 +176,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur - public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPos lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; private org.spigotmc.TickLimiter tileLimiter; @@ -364,7 +363,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable { 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.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper - Option to keep spawn chunks loaded this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime); this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime); @@ -1332,15 +1330,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } protected void tickBlockEntities() { - this.timings.tileEntityPending.startTiming(); // Spigot this.tickingBlockEntities = true; if (!this.pendingBlockEntityTickers.isEmpty()) { this.blockEntityTickers.addAll(this.pendingBlockEntityTickers); this.pendingBlockEntityTickers.clear(); } - this.timings.tileEntityPending.stopTiming(); // Spigot - this.timings.tileEntityTick.startTiming(); // Spigot // Spigot start // Iterator iterator = this.blockEntityTickers.iterator(); boolean flag = this.tickRateManager().runsNormally(); @@ -1369,9 +1364,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } this.blockEntityTickers.removeAll(toRemove); // Paper - Fix MC-117075 - this.timings.tileEntityTick.stopTiming(); // Spigot this.tickingBlockEntities = false; - co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper this.spigotConfig.currentPrimedTnt = 0; // Spigot } diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java index 88b13e6eeec956c10b486e4811b1e0dae0fd990e..31003588de8bef9952a688c486049077328e89a3 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -132,7 +132,6 @@ public final class NaturalSpawner { } public static void spawnForChunk(ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnState info, boolean spawnAnimals, boolean spawnMonsters, boolean rareSpawn) { - world.timings.mobSpawn.startTiming(); // Spigot MobCategory[] aenumcreaturetype = NaturalSpawner.SPAWNING_CATEGORIES; int i = aenumcreaturetype.length; @@ -184,8 +183,6 @@ public final class NaturalSpawner { // Paper end - Optional per player mob spawns } } - - world.timings.mobSpawn.stopTiming(); // Spigot } // Paper start - Add mobcaps commands 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 8c242b67f162a40311d7d987fd76771c38c3eadb..f1ca87ab1ab07a5b8ddda959a90f29ea6a16b346 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java @@ -114,13 +114,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 07a83e06e9cb6e30c600445809e49a3fd23a391a..171feda35239281b0ec2416485bead192dd9d0f0 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 @@ -23,14 +23,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/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java index 3d0b8761866046ae7ee6b5777fb098ce786abd94..221a4a3fbeac621ec593c7ba44b83f4b247a5589 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java @@ -792,7 +792,6 @@ public class LevelChunk extends ChunkAccess { this.chunkHolder.getEntityChunk().callEntitiesLoadEvent(); // Paper - rewrite chunk system if (this.needsDecoration) { - try (co.aikar.timings.Timing ignored = this.level.timings.chunkLoadPopulate.startTiming()) { // Paper this.needsDecoration = false; java.util.Random random = new java.util.Random(); random.setSeed(this.level.getSeed()); @@ -812,7 +811,6 @@ public class LevelChunk extends ChunkAccess { } } server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(bukkitChunk)); - } // Paper } } } @@ -1167,7 +1165,6 @@ public class LevelChunk extends ChunkAccess { if (LevelChunk.this.isTicking(blockposition)) { try { - this.blockEntity.tickTimer.startTiming(); // Spigot BlockState iblockdata = LevelChunk.this.getBlockState(blockposition); if (this.blockEntity.getType().isValid(iblockdata)) { @@ -1185,14 +1182,9 @@ public class LevelChunk extends ChunkAccess { net.minecraft.world.level.chunk.LevelChunk.this.level.getCraftServer().getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new ServerInternalException(msg, throwable))); // Paper - ServerExceptionEvent LevelChunk.this.removeBlockEntity(this.getPos()); // Paper end - Prevent block entity and entity crashes - // Spigot start - } finally { - this.blockEntity.tickTimer.stopTiming(); - // Spigot end } } } - } @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index f4fb23ebdd35e23b022bdd78421dec6d86342260..3c3b98d13587ce21bffa14a79aed963a7ce1f176 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -470,7 +470,6 @@ public final class CraftServer implements Server { this.saveCommandsConfig(); this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*"); this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions"); - //this.pluginManager.useTimings(this.configuration.getBoolean("settings.plugin-profiling")); // Paper - we already moved this this.overrideSpawnLimits(); console.autosavePeriod = this.configuration.getInt("ticks-per.autosave"); this.warningState = WarningState.value(this.configuration.getString("settings.deprecated-verbose")); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java index 94a998b877e3cfff0477cbef4400ca4113e7681d..e43203060dfc26387fd5826ffae9e9ca7a01abf2 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -373,8 +373,6 @@ public class Main { tryPreloadClass("org.jline.terminal.impl.MouseSupport"); tryPreloadClass("org.jline.terminal.impl.MouseSupport$1"); tryPreloadClass("org.jline.terminal.Terminal$MouseTracking"); - tryPreloadClass("co.aikar.timings.TimingHistory"); - tryPreloadClass("co.aikar.timings.TimingHistory$MinuteReport"); tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext"); tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$11"); tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$12"); diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java index 006adb2adb27c497ede69f87e78bc3e34499cbf8..4ee1c3461d21feab3a54e76a7c2ab80b6ea2ab38 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 + }); this.handle(task, 0L); for (CraftTask taskPending = this.head.getNext(); taskPending != null; taskPending = taskPending.getNext()) { if (taskPending == task) { @@ -515,10 +514,8 @@ public class CraftScheduler implements BukkitScheduler { this.runners.remove(task.getTaskId()); } } - MinecraftTimings.bukkitSchedulerFinishTimer.startTiming(); // Paper this.pending.addAll(temp); temp.clear(); - MinecraftTimings.bukkitSchedulerFinishTimer.stopTiming(); // Paper //this.debugHead = this.debugHead.getNextHead(currentTick); // Paper } @@ -561,7 +558,6 @@ public class CraftScheduler implements BukkitScheduler { } void parsePending() { // Paper - if (!this.isAsyncScheduler) MinecraftTimings.bukkitSchedulerPendingTimer.startTiming(); // Paper CraftTask head = this.head; CraftTask task = head.getNext(); CraftTask lastTask = head; @@ -580,7 +576,6 @@ public class CraftScheduler implements BukkitScheduler { task.setNext(null); } this.head = lastTask; - if (!this.isAsyncScheduler) MinecraftTimings.bukkitSchedulerPendingTimer.stopTiming(); // Paper } 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 index ea26d9464644b5217879b8c21b4da28e57708dcb..cee5c35ac2ba48d092f4227119c915e641a498c6 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(); @@ -50,12 +44,10 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot this.rTask = (Runnable) task; this.cTask = null; this.plugin = CraftScheduler.MINECRAFT; - this.taskName = taskName; this.internal = true; this.id = id; this.period = CraftTask.NO_REPEATING; this.taskName = taskName; - this.timings = MinecraftTimings.getInternalTaskName(taskName); } // Paper end @@ -76,7 +68,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 @@ -96,13 +87,11 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot @Override public void run() { - try (Timing ignored = timings.startTiming()) { // Paper if (this.rTask != null) { this.rTask.run(); } else { this.cTask.accept(this); } - } // Paper } long getCreatedAt() { diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..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(); - 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(); - } - // 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 050d6820efd55f73bf8aba915f6fb461bc884378..48ba783a9525cc86a9f648ed2504b0223e4b512c 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -214,12 +214,6 @@ public final class CraftMagicNumbers implements UnsafeValues { } // Paper end // ======================================================================== - // Paper start - @Override - public void reportTimings() { - co.aikar.timings.TimingsExport.reportTimings(); - } - // Paper end public static byte toLegacyData(BlockState data) { return CraftLegacy.toLegacyData(data); @@ -490,10 +484,6 @@ public final class CraftMagicNumbers implements UnsafeValues { return new CraftDamageSourceBuilder(damageType); } // Paper start - @Override - public String getTimingsServerName() { - return io.papermc.paper.configuration.GlobalConfiguration.get().timings.serverName; - } @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java index b4cca06a583fbb7918237de256f43ee61fd8ec6c..dd4a5f610e6e84a73051a8ed46e1961804356ca3 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -80,41 +80,6 @@ public class GaleGlobalConfiguration extends ConfigurationPart { public int premiumAccountSlowLoginTimeout = -1; // Gale - make slow login timeout configurable public boolean ignoreNullLegacyStructureData = false; // Gale - MultiPaper - ignore null legacy structure data - public IncludeInTimingsReport includeInTimingsReport; - - public class IncludeInTimingsReport extends ConfigurationPart { - - // Gale start - include server.properties in timings - public ServerProperties serverProperties; - public class ServerProperties extends ConfigurationPart { - public boolean dataPacks = true; - public boolean enableRcon = false; - public boolean generatorSettings = true; - public boolean levelName = false; - public boolean motd = false; - public boolean queryPort = false; - public boolean rconPort = false; - public boolean resourcePackPrompt = false; - @Setting("resource-pack-and-resource-pack-sha1") - public boolean resourcePackAndResourcePackSha1 = false; - public boolean serverIp = false; - public boolean serverPort = false; - public boolean textFilteringConfig = false; - } - // Gale end - include server.properties in timings - - // Gale start - include hardware specs in timings - public HardwareSpecs hardwareSpecs; - public class HardwareSpecs extends ConfigurationPart { - public boolean cpu = true; - public boolean disks = true; - public boolean gpus = true; - public boolean memory = true; - } - // Gale end - include hardware specs in timings - - } - public Keepalive keepalive; public class Keepalive extends ConfigurationPart { public boolean sendMultiple = true; // Gale - Purpur - send multiple keep-alive packets diff --git a/src/main/java/org/galemc/gale/configuration/timingsexport/GaleConfigurationTimingsExport.java b/src/main/java/org/galemc/gale/configuration/timingsexport/GaleConfigurationTimingsExport.java deleted file mode 100644 index 579c2e69d8f6ce8398eb1297d1d1ead98c9068a5..0000000000000000000000000000000000000000 --- a/src/main/java/org/galemc/gale/configuration/timingsexport/GaleConfigurationTimingsExport.java +++ /dev/null @@ -1,19 +0,0 @@ -// Gale - Gale configuration - -package org.galemc.gale.configuration.timingsexport; - -import co.aikar.timings.TimingsExport; -import org.bukkit.Bukkit; -import org.jetbrains.annotations.NotNull; -import org.json.simple.JSONObject; - -public final class GaleConfigurationTimingsExport { - - private GaleConfigurationTimingsExport() {} - - public static @NotNull JSONObject get() { - var json = TimingsExport.mapAsJSON(Bukkit.spigot().getGaleConfig(), null); - return json; - } - -} diff --git a/src/main/java/org/galemc/gale/configuration/timingsexport/VanillaServerPropertiesTimingsExport.java b/src/main/java/org/galemc/gale/configuration/timingsexport/VanillaServerPropertiesTimingsExport.java deleted file mode 100644 index 139d946346594d2a59a8b2930c4eae794c880dbc..0000000000000000000000000000000000000000 --- a/src/main/java/org/galemc/gale/configuration/timingsexport/VanillaServerPropertiesTimingsExport.java +++ /dev/null @@ -1,129 +0,0 @@ -// Gale - include server.properties in timings - -package org.galemc.gale.configuration.timingsexport; - -import co.aikar.timings.TimingsExport; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.dedicated.DedicatedServer; -import org.galemc.gale.configuration.GaleGlobalConfiguration; -import org.jetbrains.annotations.NotNull; -import org.json.simple.JSONObject; - -import java.util.Optional; - -/** - * Exports the vanilla server.properties to a JSON object, to be included in a timings report. - * - * @see TimingsExport - * - * @author Martijn Muijsers under GPL-3.0 - */ -public final class VanillaServerPropertiesTimingsExport { - - private VanillaServerPropertiesTimingsExport() {} - - @SuppressWarnings("unchecked") - public static @NotNull JSONObject get() { - - var json = new JSONObject(); - var properties = ((DedicatedServer) MinecraftServer.getServer()).getProperties(); - var includeConfig = GaleGlobalConfiguration.get().misc.includeInTimingsReport.serverProperties; - - json.put("allow-flight", String.valueOf(properties.allowFlight)); - json.put("allow-nether", String.valueOf(properties.allowNether)); - json.put("broadcast-console-to-ops", String.valueOf(properties.broadcastConsoleToOps)); - json.put("broadcast-rcon-to-ops", String.valueOf(properties.broadcastRconToOps)); - json.put("debug", String.valueOf(properties.debug)); - json.put("difficulty", String.valueOf(properties.difficulty)); - json.put("enable-command-block", String.valueOf(properties.enableCommandBlock)); - json.put("enable-jmx-monitoring", String.valueOf(properties.enableJmxMonitoring)); - json.put("enable-query", String.valueOf(properties.enableQuery)); - if (includeConfig.enableRcon) { - json.put("enable-rcon", String.valueOf(properties.enableRcon)); - } - json.put("enable-status", String.valueOf(properties.enableStatus)); - json.put("enforce-secure-profile", String.valueOf(properties.enforceSecureProfile)); - json.put("enforce-whitelist", String.valueOf(properties.enforceWhitelist)); - json.put("entity-broadcast-range-percentage", String.valueOf(properties.entityBroadcastRangePercentage)); - json.put("force-gamemode", String.valueOf(properties.forceGameMode)); - json.put("function-permission-level", String.valueOf(properties.functionPermissionLevel)); - json.put("gamemode", String.valueOf(properties.gamemode)); - Optional.ofNullable(properties.worldOptions).ifPresent(worldOptions -> json.put("generate-structures", String.valueOf(worldOptions.generateStructures()))); - if (includeConfig.generatorSettings) { - Optional.ofNullable(properties.worldDimensionData).ifPresent(worldDimensionData -> json.put("generator-settings", String.valueOf(worldDimensionData.generatorSettings()))); - } - json.put("hardcore", String.valueOf(properties.hardcore)); - json.put("hide-online-players", String.valueOf(properties.hideOnlinePlayers)); - if (includeConfig.dataPacks) { - Optional.ofNullable(properties.initialDataPackConfiguration).ifPresent(initialDataPackConfiguration -> { - json.put("initial-enabled-packs", String.valueOf(initialDataPackConfiguration.getEnabled())); - json.put("initial-disabled-packs", String.valueOf(initialDataPackConfiguration.getDisabled())); - }); - } - if (includeConfig.levelName) { - json.put("level-name", String.valueOf(properties.levelName)); - } - // Note: level-seed is never included to prevent it being leaked -// if (includeConfig.levelSeed) { -// json.put("level-seed", String.valueOf(properties.levelSeed)); -// } - Optional.ofNullable(properties.worldDimensionData).ifPresent(worldDimensionData -> json.put("level-type", String.valueOf(worldDimensionData.levelType()))); - json.put("log-ips", String.valueOf(properties.logIPs)); - json.put("max-chained-neighbor-updates", String.valueOf(properties.maxChainedNeighborUpdates)); - json.put("max-players", String.valueOf(properties.maxPlayers)); - json.put("max-tick-time", String.valueOf(properties.maxTickTime)); - json.put("max-world-size", String.valueOf(properties.maxWorldSize)); - if (includeConfig.motd) { - json.put("motd", String.valueOf(properties.motd)); - } - json.put("network-compression-threshold", String.valueOf(properties.networkCompressionThreshold)); - json.put("online-mode", String.valueOf(properties.onlineMode)); - json.put("op-permission-level", String.valueOf(properties.opPermissionLevel)); - Optional.ofNullable(properties.playerIdleTimeout).ifPresent(playerIdleTimeout -> json.put("player-idle-timeout", String.valueOf(playerIdleTimeout.get()))); - json.put("prevent-proxy-connections", String.valueOf(properties.preventProxyConnections)); - json.put("pvp", String.valueOf(properties.pvp)); - if (includeConfig.queryPort) { - json.put("query-port", String.valueOf(properties.queryPort)); - } - json.put("rate-limit", String.valueOf(properties.rateLimitPacketsPerSecond)); - // Note: rcon-password is never included to prevent it being leaked -// if (includeConfig.rconPassword) { -// json.put("rcon-password", String.valueOf(properties.rconPassword)); -// } - if (includeConfig.rconPort) { - json.put("rcon-port", String.valueOf(properties.queryPort)); - } - properties.serverResourcePackInfo.ifPresent(serverResourcePackInfo -> { - json.put("require-resource-pack", String.valueOf(serverResourcePackInfo.isRequired())); - if (includeConfig.resourcePackAndResourcePackSha1) { - json.put("resource-pack", String.valueOf(serverResourcePackInfo.url())); - json.put("resource-pack-sha1", String.valueOf(serverResourcePackInfo.hash())); - } - }); - if (includeConfig.resourcePackPrompt) { - json.put("resource-pack-prompt", String.valueOf(properties.resourcePackPrompt)); - } - if (includeConfig.serverIp) { - json.put("server-ip", String.valueOf(properties.serverIp)); - } - if (includeConfig.serverPort) { - json.put("server-port", String.valueOf(properties.serverPort)); - } - json.put("simulation-distance", String.valueOf(properties.simulationDistance)); - json.put("spawn-animals", String.valueOf(properties.spawnAnimals)); - json.put("spawn-monsters", String.valueOf(properties.spawnMonsters)); - json.put("spawn-npcs", String.valueOf(properties.spawnNpcs)); - json.put("spawn-protection", String.valueOf(properties.spawnProtection)); - json.put("sync-chunk-writes", String.valueOf(properties.syncChunkWrites)); - if (includeConfig.textFilteringConfig) { - json.put("text-filtering-config", String.valueOf(properties.textFilteringConfig)); - } - json.put("use-native-transport", String.valueOf(properties.useNativeTransport)); - json.put("view-distance", String.valueOf(properties.viewDistance)); - Optional.ofNullable(properties.whiteList).ifPresent(whiteList -> json.put("white-list", String.valueOf(whiteList.get()))); - - return json; - - } - -} diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java index c6c58c398b2ce4741301afaa04d2ba2dbee475d4..67e33ce28e3a775b6611334471061f72cae18cae 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -35,7 +35,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; @@ -184,7 +183,6 @@ public class ActivationRange */ public static void activateEntities(Level world) { - MinecraftTimings.entityActivationCheckTimer.startTiming(); final int miscActivationRange = world.spigotConfig.miscActivationRange; final int raiderActivationRange = world.spigotConfig.raiderActivationRange; final int animalActivationRange = world.spigotConfig.animalActivationRange; @@ -263,7 +261,6 @@ public class ActivationRange } // Paper end } - MinecraftTimings.entityActivationCheckTimer.stopTiming(); } /**