From f177f878a8841e3a30455c83cfe7281ea0c4407e Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 18 Jan 2020 09:50:23 -0800 Subject: [PATCH] Full chunk debug on incremental watchdog (#2868) --- ...395-Asynchronous-chunk-IO-and-loading.patch | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/Spigot-Server-Patches/0395-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0395-Asynchronous-chunk-IO-and-loading.patch index cfb55b5c36..5e9454f86a 100644 --- a/Spigot-Server-Patches/0395-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0395-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From d6ca62d0cc96ae7d4d4ae5547bdc75daafe401e6 Mon Sep 17 00:00:00 2001 +From 94151e2bc6e9f31006421670d275c3822a32efa2 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 13 Jul 2019 09:23:10 -0700 Subject: [PATCH] Asynchronous chunk IO and loading @@ -4107,7 +4107,7 @@ index 2a33b90ef..0d036e5d9 100644 @Override public int getViewDistance() { diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 07936eeba..fe68df45b 100644 +index 07936eeba..5bdcdcf9e 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -6,6 +6,7 @@ import java.lang.management.ThreadInfo; @@ -4118,22 +4118,14 @@ index 07936eeba..fe68df45b 100644 import net.minecraft.server.MinecraftServer; import org.bukkit.Bukkit; -@@ -84,6 +85,7 @@ public class WatchdogThread extends Thread - log.log( Level.SEVERE, "If you are unsure or still think this is a Paper bug, please report this to https://github.com/PaperMC/Paper/issues" ); - log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" ); - log.log( Level.SEVERE, "Paper version: " + Bukkit.getServer().getVersion() ); -+ ChunkTaskManager.dumpAllChunkLoadInfo(); // Paper - // - if ( net.minecraft.server.World.lastPhysicsProblem != null ) - { -@@ -112,6 +114,7 @@ public class WatchdogThread extends Thread +@@ -112,6 +113,7 @@ public class WatchdogThread extends Thread // Paper end - Different message for short timeout log.log( Level.SEVERE, "------------------------------" ); log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper -+ log.log( Level.SEVERE, "The server is waiting on these chunks: " + ChunkTaskManager.getChunkWaitInfo() ); // Paper - async chunk debug ++ ChunkTaskManager.dumpAllChunkLoadInfo(); // Paper dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log ); log.log( Level.SEVERE, "------------------------------" ); // -- -2.24.1.windows.2 +2.25.0.windows.1