Update sync chunk load debug patch

Had to drop some hunks modifying getEntities, as those methods were rewritten by Mojang in 1.17

patches/removed/1.17/0372-Reduce-sync-loads.patch

@@ -1,350 +1,33 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Fri, 19 Jul 2019 03:29:14 -0700
-Subject: [PATCH] Reduce sync loads
-1.17: more entity stuff that someone has to figure out!
-This reduces calls to getChunkAt which would load chunks.
+These hunks are for getEntities, which Mojang rewrote in 1.17.
 
-This patch also adds a tool to find calls which are doing this, however
-it must be enabled by setting the startup flag -Dpaper.debug-sync-loads=true
-
-To get a debug log for sync loads, the command is /paper syncloadinfo
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 62711d95db62221a2e4e6423c518afe13a6c7dbe..ff718bc7f521575e6a670e17fcf59a2d30841705 100644
---- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -1,12 +1,18 @@
- package com.destroystokyo.paper;
- 
- import com.destroystokyo.paper.io.chunk.ChunkTaskManager;
-+import com.destroystokyo.paper.io.SyncLoadFinder;
- import com.google.common.base.Functions;
- import com.google.common.base.Joiner;
- import com.google.common.collect.ImmutableSet;
- import com.google.common.collect.Iterables;
- import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
-+import com.google.gson.JsonObject;
-+import com.google.gson.internal.Streams;
-+import com.google.gson.stream.JsonWriter;
-+import net.minecraft.resources.ResourceLocation;
-+import net.minecraft.server.MCUtil;
- import net.minecraft.server.MinecraftServer;
- import net.minecraft.server.level.ChunkHolder;
- import net.minecraft.server.level.ServerChunkCache;
-@@ -14,7 +20,6 @@ import net.minecraft.server.level.ServerLevel;
- import net.minecraft.world.entity.Entity;
- import net.minecraft.world.entity.EntityType;
- import net.minecraft.world.level.ChunkPos;
--import net.minecraft.resources.ResourceLocation;
- import net.minecraft.server.MCUtil;
- import org.apache.commons.lang3.tuple.MutablePair;
- import org.apache.commons.lang3.tuple.Pair;
-@@ -29,6 +34,9 @@ import org.bukkit.craftbukkit.CraftWorld;
- import org.bukkit.entity.Player;
- 
- import java.io.File;
-+import java.io.FileOutputStream;
-+import java.io.PrintStream;
-+import java.io.StringWriter;
- import java.time.LocalDateTime;
- import java.time.format.DateTimeFormatter;
- import java.util.ArrayList;
-@@ -44,7 +52,7 @@ import java.util.stream.Collectors;
- 
- public class PaperCommand extends Command {
-     private static final String BASE_PERM = "bukkit.command.paper.";
--    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version", "debug", "chunkinfo", "dumpwaiting").build();
-+    private static final ImmutableSet<String> SUBCOMMANDS = ImmutableSet.<String>builder().add("heap", "entity", "reload", "version", "debug", "chunkinfo", "dumpwaiting", "syncloadinfo").build();
- 
-     public PaperCommand(String name) {
-         super(name);
-@@ -162,6 +170,9 @@ public class PaperCommand extends Command {
-             case "chunkinfo":
-                 doChunkInfo(sender, args);
-                 break;
-+            case "syncloadinfo":
-+                this.doSyncLoadInfo(sender, args);
-+                break;
-             case "ver":
-                 if (!testPermission(sender, "version")) break; // "ver" needs a special check because it's an alias. All other commands are checked up before the switch statement (because they are present in the SUBCOMMANDS set)
-             case "version":
-@@ -179,6 +190,40 @@ public class PaperCommand extends Command {
-         return true;
-     }
- 
-+    private void doSyncLoadInfo(CommandSender sender, String[] args) {
-+        if (!SyncLoadFinder.ENABLED) {
-+            sender.sendMessage(ChatColor.RED + "This command requires the server startup flag '-Dpaper.debug-sync-loads=true' to be set.");
-+            return;
-+        }
-+        File file = new File(new File(new File("."), "debug"),
-+            "sync-load-info" + DateTimeFormatter.ofPattern("yyyy-MM-dd_HH.mm.ss").format(LocalDateTime.now()) + ".txt");
-+        file.getParentFile().mkdirs();
-+        sender.sendMessage(ChatColor.GREEN + "Writing sync load info to " + file.toString());
-+
-+
-+        try {
-+            final JsonObject data = SyncLoadFinder.serialize();
-+
-+            StringWriter stringWriter = new StringWriter();
-+            JsonWriter jsonWriter = new JsonWriter(stringWriter);
-+            jsonWriter.setIndent(" ");
-+            jsonWriter.setLenient(false);
-+            Streams.write(data, jsonWriter);
-+
-+            String fileData = stringWriter.toString();
-+
-+            try (
-+                PrintStream out = new PrintStream(new FileOutputStream(file), false, "UTF-8")
-+            ) {
-+                out.print(fileData);
-+            }
-+            sender.sendMessage(ChatColor.GREEN + "Successfully written sync load information!");
-+        } catch (Throwable thr) {
-+            sender.sendMessage(ChatColor.RED + "Failed to write sync load information");
-+            thr.printStackTrace();
-+        }
-+    }
-+
-     private void doChunkInfo(CommandSender sender, String[] args) {
-         List<org.bukkit.World> worlds;
-         if (args.length < 2 || args[1].equals("*")) {
-diff --git a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..524f33371b9de1d4dd6972fe59ffbe1804d7c5f3
---- /dev/null
-+++ b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java
-@@ -0,0 +1,171 @@
-+package com.destroystokyo.paper.io;
-+
-+import com.google.gson.JsonArray;
-+import com.google.gson.JsonObject;
-+import com.mojang.datafixers.util.Pair;
-+import it.unimi.dsi.fastutil.longs.Long2IntMap;
-+import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
-+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-+
-+import java.util.ArrayList;
-+import java.util.List;
-+import java.util.Map;
-+import java.util.WeakHashMap;
-+import net.minecraft.world.level.Level;
-+
-+public class SyncLoadFinder {
-+
-+    public static final boolean ENABLED = Boolean.getBoolean("paper.debug-sync-loads");
-+
-+    private static final WeakHashMap<Level, Object2ObjectOpenHashMap<ThrowableWithEquals, SyncLoadInformation>> SYNC_LOADS = new WeakHashMap<>();
-+
-+    private static final class SyncLoadInformation {
-+
-+        public int times;
-+
-+        public final Long2IntOpenHashMap coordinateTimes = new Long2IntOpenHashMap();
-+    }
-+
-+    public static void logSyncLoad(final Level world, final int chunkX, final int chunkZ) {
-+        if (!ENABLED) {
-+            return;
-+        }
-+
-+        final ThrowableWithEquals stacktrace = new ThrowableWithEquals(Thread.currentThread().getStackTrace());
-+
-+        SYNC_LOADS.compute(world, (final Level keyInMap, Object2ObjectOpenHashMap<ThrowableWithEquals, SyncLoadInformation> map) -> {
-+            if (map == null) {
-+                map = new Object2ObjectOpenHashMap<>();
-+            }
-+
-+            map.compute(stacktrace, (ThrowableWithEquals keyInMap0, SyncLoadInformation valueInMap) -> {
-+                if (valueInMap == null) {
-+                    valueInMap = new SyncLoadInformation();
-+                }
-+
-+                ++valueInMap.times;
-+
-+                valueInMap.coordinateTimes.compute(IOUtil.getCoordinateKey(chunkX, chunkZ), (Long keyInMap1, Integer valueInMap1) -> {
-+                    return valueInMap1 == null ? Integer.valueOf(1) : Integer.valueOf(valueInMap1.intValue() + 1);
-+                });
-+
-+                return valueInMap;
-+            });
-+
-+            return map;
-+        });
-+    }
-+
-+    public static JsonObject serialize() {
-+        final JsonObject ret = new JsonObject();
-+
-+        final JsonArray worldsData = new JsonArray();
-+
-+        for (final Map.Entry<Level, Object2ObjectOpenHashMap<ThrowableWithEquals, SyncLoadInformation>> entry : SYNC_LOADS.entrySet()) {
-+            final Level world = entry.getKey();
-+
-+            final JsonObject worldData = new JsonObject();
-+
-+            worldData.addProperty("name", world.getWorld().getName());
-+
-+            final List<Pair<ThrowableWithEquals, SyncLoadInformation>> data = new ArrayList<>();
-+
-+            entry.getValue().forEach((ThrowableWithEquals stacktrace, SyncLoadInformation times) -> {
-+                data.add(new Pair<>(stacktrace, times));
-+            });
-+
-+            data.sort((Pair<ThrowableWithEquals, SyncLoadInformation> pair1, Pair<ThrowableWithEquals, SyncLoadInformation> pair2) -> {
-+                return Integer.compare(pair2.getSecond().times, pair1.getSecond().times); // reverse order
-+            });
-+
-+            final JsonArray stacktraces = new JsonArray();
-+
-+            for (Pair<ThrowableWithEquals, SyncLoadInformation> pair : data) {
-+                final JsonObject stacktrace = new JsonObject();
-+
-+                stacktrace.addProperty("times", pair.getSecond().times);
-+
-+                final JsonArray traces = new JsonArray();
-+
-+                for (StackTraceElement element : pair.getFirst().stacktrace) {
-+                    traces.add(String.valueOf(element));
-+                }
-+
-+                stacktrace.add("stacktrace", traces);
-+
-+                final JsonArray coordinates = new JsonArray();
-+
-+                for (Long2IntMap.Entry coordinate : pair.getSecond().coordinateTimes.long2IntEntrySet()) {
-+                    final long key = coordinate.getLongKey();
-+                    final int times = coordinate.getIntValue();
-+                    coordinates.add("(" + IOUtil.getCoordinateX(key) + "," + IOUtil.getCoordinateZ(key) + "): " + times);
-+                }
-+
-+                stacktrace.add("coordinates", coordinates);
-+
-+                stacktraces.add(stacktrace);
-+            }
-+
-+
-+            worldData.add("stacktraces", stacktraces);
-+            worldsData.add(worldData);
-+        }
-+
-+        ret.add("worlds", worldsData);
-+
-+        return ret;
-+    }
-+
-+    static final class ThrowableWithEquals {
-+
-+        private final StackTraceElement[] stacktrace;
-+        private final int hash;
-+
-+        public ThrowableWithEquals(final StackTraceElement[] stacktrace) {
-+            this.stacktrace = stacktrace;
-+            this.hash = ThrowableWithEquals.hash(stacktrace);
-+        }
-+
-+        public static int hash(final StackTraceElement[] stacktrace) {
-+            int hash = 0;
-+
-+            for (int i = 0; i < stacktrace.length; ++i) {
-+                hash *= 31;
-+                hash += stacktrace[i].hashCode();
-+            }
-+
-+            return hash;
-+        }
-+
-+        @Override
-+        public int hashCode() {
-+            return this.hash;
-+        }
-+
-+        @Override
-+        public boolean equals(final Object obj) {
-+            if (obj == null || obj.getClass() != this.getClass()) {
-+                return false;
-+            }
-+
-+            final ThrowableWithEquals other = (ThrowableWithEquals)obj;
-+            final StackTraceElement[] otherStackTrace = other.stacktrace;
-+
-+            if (this.stacktrace.length != otherStackTrace.length || this.hash != other.hash) {
-+                return false;
-+            }
-+
-+            if (this == obj) {
-+                return true;
-+            }
-+
-+            for (int i = 0; i < this.stacktrace.length; ++i) {
-+                if (!this.stacktrace[i].equals(otherStackTrace[i])) {
-+                    return false;
-+                }
-+            }
-+
-+            return true;
-+        }
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 120b604d91643248ab375969f95f62a74cbf6be7..5e0d55c3821b1769d20514a8a6c5c74477019778 100644
---- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -494,6 +494,7 @@ public class ServerChunkCache extends ChunkSource {
-                 this.level.asyncChunkTaskManager.raisePriority(x1, z1, com.destroystokyo.paper.io.PrioritizedTaskQueue.HIGHEST_PRIORITY);
-                 com.destroystokyo.paper.io.chunk.ChunkTaskManager.pushChunkWait(this.level, x1, z1);
-                 // Paper end
-+                com.destroystokyo.paper.io.SyncLoadFinder.logSyncLoad(this.level, x1, z1); // Paper - sync load info
-                 this.level.timings.syncChunkLoad.startTiming(); // Paper
-             this.mainThreadProcessor.managedBlock(completablefuture::isDone);
-                 com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9d4c81a4964317a0726171dc6d490d12bd959cc4..01f879a8dd0e1ffec380e02072567330152eaceb 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -276,6 +276,12 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
-     };
-     public final com.destroystokyo.paper.io.chunk.ChunkTaskManager asyncChunkTaskManager;
-     // Paper end
-+    // Paper start
-+    @Override
-+    public boolean hasChunk(int chunkX, int chunkZ) {
-+        return this.getChunkSource().getChunkAtIfLoadedImmediately(chunkX, chunkZ) != null;
-+    }
-+    // Paper end
- 
-     // Add env and gen to constructor, WorldData -> WorldDataServer
-     public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, ServerLevelData iworlddataserver, ResourceKey<net.minecraft.world.level.Level> resourcekey, DimensionType dimensionmanager, ChunkProgressListener worldloadlistener, ChunkGenerator chunkgenerator, boolean flag, long i, List<CustomSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
 index 3a1b9f1ba19b28cebdafeb3b2476217d47213862..3e2cd6c7a34c1a792d7346019a8b039d1f4a7c04 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -1130,7 +1130,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- 
+
          for (int i1 = i; i1 <= j; ++i1) {
              for (int j1 = k; j1 <= l; ++j1) {
 -                LevelChunk chunk = ichunkprovider.getChunk(i1, j1, false);
 +                LevelChunk chunk = (LevelChunk)this.getChunkIfLoadedImmediately(i1, j1); // Paper
- 
+
                  if (chunk != null) {
                      chunk.getEntities(except, box, list, predicate);
 @@ -1151,7 +1151,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- 
+
          for (int i1 = i; i1 < j; ++i1) {
              for (int j1 = k; j1 < l; ++j1) {
 -                LevelChunk chunk = this.getChunkSource().getChunk(i1, j1, false);
 +                LevelChunk chunk = (LevelChunk)this.getChunkIfLoadedImmediately(i1, j1); // Paper
- 
+
                  if (chunk != null) {
                      chunk.getEntities(type, box, list, predicate);
 @@ -1174,7 +1174,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- 
+
          for (int i1 = i; i1 < j; ++i1) {
              for (int j1 = k; j1 < l; ++j1) {
 -                LevelChunk chunk = ichunkprovider.getChunk(i1, j1, false);
 +                LevelChunk chunk = (LevelChunk)this.getChunkIfLoadedImmediately(i1, j1); // Paper
- 
+
                  if (chunk != null) {
                      chunk.getEntitiesOfClass(entityClass, box, list, predicate);