Add virtual thread utility and expand metrics

patches/server/0007-Gale-metrics.patch

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 4b002e8b75d117b726b0de274a76d3596fce015b..a83a1dc5a3ecc3780e12721bb3022867d80b34d4 100644
+index 4b002e8b75d117b726b0de274a76d3596fce015b..f3179676ec933db1697d8077b1c69082d00192d0 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
 @@ -593,7 +593,7 @@ public class Metrics {
@@ -24,7 +24,7 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..a83a1dc5a3ecc3780e12721bb3022867
                  metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
                  metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline"));
 -                final String paperVersion;
-+                final String galeVersion; // Gale - branding changes
++                final String galeVersion; // Gale - branding changes - metrics
                  final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion();
                  if (implVersion != null) {
                      final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1);
@@ -32,10 +32,218 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..a83a1dc5a3ecc3780e12721bb3022867
 +                    galeVersion = "git-Gale-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Gale - branding changes - metrics
                  } else {
 -                    paperVersion = "unknown";
-+                    galeVersion = "unknown"; // Gale - branding changes
++                    galeVersion = "unknown"; // Gale - branding changes - metrics
                  }
 -                metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion));
 +                metrics.addCustomChart(new Metrics.SimplePie("gale_version", () -> galeVersion)); // Gale - branding changes - metrics
  
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
+@@ -676,6 +676,194 @@ public class Metrics {
+ 
+                     return map;
+                 }));
++
++                // Gale start - metrics - proxy
++                metrics.addCustomChart(new Metrics.DrilldownPie("proxy", () -> {
++                    String type;
++                    boolean onlineMode;
++                    var proxiesConfig = io.papermc.paper.configuration.GlobalConfiguration.get().proxies;
++                    if (proxiesConfig.velocity.enabled) {
++                        type = "Velocity";
++                        onlineMode = proxiesConfig.velocity.onlineMode;
++                    } else if (org.spigotmc.SpigotConfig.bungee) {
++                        type = "BungeeCord";
++                        onlineMode = proxiesConfig.bungeeCord.onlineMode;
++                    } else {
++                        type = "none";
++                        onlineMode = Bukkit.getOnlineMode();
++                    }
++
++                    Map<String, Map<String, Integer>> map = new HashMap<>();
++
++                    // insert online mode as lower dimension
++                    Map<String, Integer> entry = new HashMap<>();
++                    entry.put(onlineMode ? "online" : "offline", 1);
++
++                    // create type as higher dimension
++                    map.put(type, entry);
++
++                    return map;
++                }));
++                // Gale end - metrics - proxy
++
++                // Gale start - metrics - per-server player count
++                metrics.addCustomChart(new Metrics.DrilldownPie("per_server_player_count", () -> {
++                    Map<String, Map<String, Integer>> map = new HashMap<>();
++
++                    // count players
++                    int playerCount = Bukkit.getOnlinePlayers().size();
++
++                    // insert real value as lower dimension
++                    Map<String, Integer> entry = new HashMap<>();
++                    entry.put(String.valueOf(playerCount), 1);
++
++                    // create buckets as higher dimension
++                    if (playerCount <= 5) {
++                        map.put(String.valueOf(playerCount), entry);
++                    } else if (playerCount > 1000) {
++                        map.put("> 1000", entry);
++                    } else {
++                        int divisor;
++                        if (playerCount <= 50) {
++                            divisor = 5;
++                        } else if (playerCount <= 100) {
++                            divisor = 10;
++                        } else if (playerCount <= 250) {
++                            divisor = 25;
++                        } else if (playerCount <= 500) {
++                            divisor = 50;
++                        } else {
++                            divisor = 100;
++                        }
++                        int start = (playerCount - 1) / divisor * divisor + 1;
++                        int end = start + divisor - 1;
++                        map.put(start + "-" + end, entry);
++                    }
++
++                    return map;
++                }));
++                // Gale end - metrics - per-server player count
++
++                // Gale start - metrics - plugin count
++                metrics.addCustomChart(new Metrics.DrilldownPie("plugin_count", () -> {
++                    Map<String, Map<String, Integer>> map = new HashMap<>();
++
++                    // count plugins
++                    int pluginCount = Bukkit.getPluginManager().getPlugins().length;
++
++                    // insert real value as lower dimension
++                    Map<String, Integer> entry = new HashMap<>();
++                    entry.put(String.valueOf(pluginCount), 1);
++
++                    // create buckets as higher dimension
++                    if (pluginCount <= 5) {
++                        map.put(String.valueOf(pluginCount), entry);
++                    } else if (pluginCount > 1000) {
++                        map.put("> 1000", entry);
++                    } else {
++                        int divisor;
++                        if (pluginCount <= 50) {
++                            divisor = 5;
++                        } else if (pluginCount <= 100) {
++                            divisor = 10;
++                        } else if (pluginCount <= 250) {
++                            divisor = 25;
++                        } else if (pluginCount <= 500) {
++                            divisor = 50;
++                        } else {
++                            divisor = 100;
++                        }
++                        int start = (pluginCount - 1) / divisor * divisor + 1;
++                        int end = start + divisor - 1;
++                        map.put(start + "-" + end, entry);
++                    }
++
++                    return map;
++                }));
++                // Gale end - metrics - plugin count
++
++                // Gale start - metrics - netty threads
++                metrics.addCustomChart(new Metrics.SimplePie("netty_thread_count", () -> {
++                    // Try to get the number of Netty threads from the system property
++                    try {
++                        return System.getProperty("io.netty.eventLoopThreads");
++                    } catch (Exception ignored) {}
++                    // Otherwise, we fall back to nothing currently (reading from the Spigot configuration causes a re-read which is undesirable)
++                    return null;
++                }));
++                // Gale end - metrics - netty threads
++
++                metrics.addCustomChart(new Metrics.SimplePie("chunk_system_io_thread_count", () -> String.valueOf(io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.newChunkSystemIOThreads))); // Gale - metrics - chunk system IO threads
++
++                // Gale start - metrics - physical cores
++                metrics.addCustomChart(new Metrics.SimplePie("physical_core_count", () -> {
++                    try {
++                        int physicalProcessorCount = new oshi.SystemInfo().getHardware().getProcessor().getPhysicalProcessorCount();
++                        if (physicalProcessorCount > 0) {
++                            return String.valueOf(physicalProcessorCount);
++                        }
++                    } catch (Exception ignored) {}
++                    return null;
++                }));
++                // Gale end - metrics - physical cores
++
++                // Gale start - metrics - physical memory
++                metrics.addCustomChart(new Metrics.DrilldownPie("physical_memory_total", () -> {
++                    try {
++                        long physicalMemory = new oshi.SystemInfo().getHardware().getMemory().getTotal();
++                        if (physicalMemory > 0) {
++
++                            Map<String, Map<String, Integer>> map = new HashMap<>();
++
++                            // use floored MB as lower dimension
++                            var flooredMB = physicalMemory / (1L << 20);
++                            Map<String, Integer> entry = new HashMap<>();
++                            entry.put(flooredMB < 1 ? "< 1M" : flooredMB + "M", 1);
++
++                            // use floored GB as higher dimension
++                            var flooredGB = physicalMemory / (1L << 30);
++                            map.put(flooredGB < 1 ? "< 1G" : flooredGB + "G", entry);
++
++                            return map;
++
++                        }
++                    } catch (Exception ignored) {}
++                    return null;
++                }));
++                // Gale end - metrics - physical memory
++
++                // Gale start - metrics - runtime max memory
++                metrics.addCustomChart(new Metrics.DrilldownPie("runtime_max_memory", () -> {
++
++                    // get memory limit
++                    long maxMemory = Runtime.getRuntime().maxMemory();
++                    if (maxMemory <= 0) {
++                        return null;
++                    }
++
++                    Map<String, Map<String, Integer>> map = new HashMap<>();
++
++                    // in the case of no limit
++                    if (maxMemory == Long.MAX_VALUE) {
++                        Map<String, Integer> entry = new HashMap<>();
++                        entry.put("no limit", 1);
++                        map.put("no limit", entry);
++                        return map;
++                    }
++
++                    // use floored MB as lower dimension
++                    var flooredMB = maxMemory / (1L << 20);
++                    Map<String, Integer> entry = new HashMap<>();
++                    entry.put(flooredMB < 1 ? "< 1M" : flooredMB + "M", 1);
++
++                    // use floored GB as higher dimension
++                    var flooredGB = maxMemory / (1L << 30);
++                    map.put(flooredGB < 1 ? "< 1G" : flooredGB + "G", entry);
++
++                    return map;
++                }));
++                // Gale end - metrics - runtime max memory
++
+             }
+ 
+         }
+diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkTaskScheduler.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkTaskScheduler.java
+index f975cb93716e137d973ff2f9011acdbef58859a2..d94eb8ca7ce18364d58d05592bbdf3637581460f 100644
+--- a/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkTaskScheduler.java
++++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/ChunkTaskScheduler.java
+@@ -42,7 +42,7 @@ public final class ChunkTaskScheduler {
+ 
+     private static final Logger LOGGER = LogUtils.getClassLogger();
+ 
+-    static int newChunkSystemIOThreads;
++    public static int newChunkSystemIOThreads; // Gale - metrics - chunk system IO threads - package-private -> public
+     static int newChunkSystemWorkerThreads;
+     static int newChunkSystemGenParallelism;
+     static int newChunkSystemLoadParallelism;

patches/server/0008-Gale-semantic-version.patch

@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martijn Muijsers <martijnmuijsers@live.nl>
+Date: Wed, 9 Aug 2023 19:04:22 +0200
+Subject: [PATCH] Gale semantic version
+
+License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
+Gale - https://galemc.org
+
+diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
+index f3179676ec933db1697d8077b1c69082d00192d0..3ebecc68b7c38c94a5c20e4b8ac1e2fa5d69321f 100644
+--- a/src/main/java/com/destroystokyo/paper/Metrics.java
++++ b/src/main/java/com/destroystokyo/paper/Metrics.java
+@@ -864,6 +864,16 @@ public class Metrics {
+                 }));
+                 // Gale end - metrics - runtime max memory
+ 
++                // Gale start - semantic version - include in metrics
++                Map<String, Map<String, Integer>> semanticVersionMap = new HashMap<>();
++                {
++                    Map<String, Integer> entry = new HashMap<>();
++                    entry.put(org.galemc.gale.version.GaleSemanticVersion.version, 1);
++                    semanticVersionMap.put(org.galemc.gale.version.GaleSemanticVersion.majorMinorVersion, entry);
++                }
++                metrics.addCustomChart(new Metrics.DrilldownPie("gale_semantic_version", () -> semanticVersionMap));
++                // Gale end - semantic version - include in metrics
++
+             }
+ 
+         }
+diff --git a/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..522d1522e4f91f4ab3b941c804691915d609aae1
+--- /dev/null
++++ b/src/main/java/org/galemc/gale/version/GaleSemanticVersion.java
+@@ -0,0 +1,37 @@
++// Gale - semantic version
++
++package org.galemc.gale.version;
++
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * A holder for the Gale semantic version.
++ */
++public final class GaleSemanticVersion {
++
++    private GaleSemanticVersion() {
++        throw new RuntimeException();
++    }
++
++    /**
++     * A semantic version in the format "<code>major.minor.patch</code>", for example "<code>1.5.1</code>".
++     * The <code>major</code> version is incremented when a large and overarching set of features, with a large
++     * and overarching common goal or effect, has been added compared to the first release with that major version.
++     * The <code>minor</code> version is incremented for each build that has a different intended feature set
++     * (for example, some features or part of them were added or removed).
++     * The <code>patch</code> version is incremented for small changes that do not affect the goal of any feature,
++     * such as bug fixes or changes in wording.
++     */
++    public static final @NotNull String version = "0.4.0";
++
++    /**
++     * The "<code>major.minor</code>" portion of the {@link #version}.
++     */
++    public static final @NotNull String majorMinorVersion;
++    static {
++        int firstDotIndex = version.indexOf('.');
++        int secondDotIndex = version.indexOf('.', firstDotIndex + 1);
++        majorMinorVersion = version.substring(0, secondDotIndex);
++    }
++
++}

patches/server/0011-Gale-commands.patch

@@ -13,7 +13,7 @@ As part of: Paper (https://github.com/PaperMC/Paper)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index b98fb8afdadbda47db5924299d90082edf3ca1b4..985f1a50438b325e33fba5d07e26519171504aab 100644
+index 9d54ef5f12a24131b1504566e09cd9714b93e913..5be4267d88604210b7bfcc03b2c2056e0a9f0fb0 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -45,6 +45,7 @@ import net.minecraft.world.level.GameRules;

patches/server/0012-Include-time-in-startup-logs.patch

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index bfa091f72d6f477bcaf63d364639a1b4df9b1987..a075eaa65541ffcf4affa07e60c163fe7a0b9b4b 100644
+index 776b7fc26fe96b69be260bbd36efae147d988640..98eb3f64f9e057564ad041085d1676945a1ac182 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -2,6 +2,7 @@ package org.bukkit.craftbukkit;

patches/server/0013-Include-server.properties-in-timings.patch

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 6724cd70b2b255979b371411c7b5b8c6231b49fd..316027c618d4c03a2d5f2e89a9b9d14465569f91 100644
+index 1b9d997c31ab281ce9f4719f53b0ad78a430789d..758cb80e64520ff085c4ef5ca8b2ed77d4bc0162 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -35,6 +35,7 @@ import org.bukkit.Material;

patches/server/0014-Include-hardware-specs-in-timings.patch

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 316027c618d4c03a2d5f2e89a9b9d14465569f91..7475f41b3895aa730cae285dec60b7a76006753e 100644
+index 758cb80e64520ff085c4ef5ca8b2ed77d4bc0162..f749516e5d3c22e808638f3a7672aab837571b1a 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -35,6 +35,7 @@ import org.bukkit.Material;

patches/server/0015-Use-timin.gs-by-default.patch

@@ -13,7 +13,7 @@ As part of: Mirai (https://github.com/etil2jz/Mirai)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 8d442c5a498ecf288a0cc0c54889c6e2fda849ce..811a35412b5cba79287195762e7a205eca6aa442 100644
+index d7f541d94941a341a70dfac025a3d3601dd1aca8..53729fcbb297806fb0de78887e4739fbe19dbb69 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -52,7 +52,7 @@ public class GlobalConfiguration extends ConfigurationPart {

patches/server/0016-Recommend-disabling-timings-on-startup.patch

@@ -31,7 +31,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 811a35412b5cba79287195762e7a205eca6aa442..a8d263c55974fb49259590851d4a2d0981d02129 100644
+index 53729fcbb297806fb0de78887e4739fbe19dbb69..4594730450e87e71f86c67af205610af1319d4df 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -50,7 +50,10 @@ public class GlobalConfiguration extends ConfigurationPart {

patches/server/0017-Make-timings-calls-final.patch

@@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1c070563cfa76bf907c961cf3703214ec88a3f75..f0c0f1098cfcc0bc4a3d9d0c5f8168bb217cda81 100644
+index 04919d27a0ba9d18c1d7cc8969049958839bf023..9ebdc32891ff243e8e7c2ff9308a8a0e329f343b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1384,7 +1384,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa