Update Paper

This update includes a new scheduler which may be used.
Currently, there are two schedulers that may be configured
in the global config file:
- EDF
- WORK_STEALING

The EDF is simply the old scheduler has used since inception.
The new WORK_STEALING scheduler provides possibly better scheduling:
- intermediate task execution
  i.e chunk loading and packet processing may happen inbetween ticks,
  lowering latency for these tasks
- NUMA aware scheduling on Linux with the `-DPaper.NumaScheduling=true`
  startup flag
- better thread/NUMA locality, as the scheduler attempts to keep regions
  on the same scheduler thread/node
- dynamic thread count adjustment

The EDF scheduler is default as it has proven to be reliable,
even if lacking.

Author: Spottedleaf

.github/workflows/build.yml

@@ -12,14 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Git Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '21'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
       - name: Configure Git User Details
         run: git config --global user.email "[email protected]" && git config --global user.name "Github Actions"
       - name: Apply Patches

folia-server/build.gradle.kts.patch

@@ -46,7 +46,7 @@
  dependencies {
 -    implementation(project(":paper-api"))
 +    implementation(project(":folia-api"))
-     implementation("ca.spottedleaf:concurrentutil:0.0.7")
+     implementation("ca.spottedleaf:concurrentutil:0.0.8")
      implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
      implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
 @@ -198,14 +_,14 @@

folia-server/minecraft-patches/features/0001-Region-Threading-Base.patch

@@ -1059,10 +1059,10 @@ index fdb0bcdca1cd38f55f191d42e422c354af4452b5..24c8581b2fa9c3ef6f6aad64bd4454d6
 
      private boolean saveChunk(final ChunkAccess chunk, final boolean unloading, final Completable<CompoundTag>[] chunkSave) {
 diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java
-index 615f30ce344455112088220a953ad78e07b284bc..94cffb77dd8aeb8329ec89d94c8709a2b67a5513 100644
+index ffb6d2ef658bc658eaf7d26d9d20590fc94432e2..9772d0f7b003de2544210c5e11f7a8c8feaf0cdd 100644
 --- a/io/papermc/paper/threadedregions/TickRegionScheduler.java
 +++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java
-@@ -69,8 +69,13 @@ public final class TickRegionScheduler {
+@@ -135,8 +135,13 @@ public final class TickRegionScheduler {
          tickThreadRunner.currentTickingRegion = region;
          if (region != null) {
              tickThreadRunner.currentTickingWorldRegionizedData = region.regioniser.world.worldRegionData.get();
@@ -1076,7 +1076,7 @@ index 615f30ce344455112088220a953ad78e07b284bc..94cffb77dd8aeb8329ec89d94c8709a2
          }
      }
 
-@@ -125,6 +130,17 @@ public final class TickRegionScheduler {
+@@ -191,6 +196,17 @@ public final class TickRegionScheduler {
          return tickThreadRunner.currentTickingTask;
      }
 
@@ -1094,21 +1094,21 @@ index 615f30ce344455112088220a953ad78e07b284bc..94cffb77dd8aeb8329ec89d94c8709a2
      /**
       * Schedules the given region
       * @throws IllegalStateException If the region is already scheduled or is ticking
-@@ -206,6 +222,9 @@ public final class TickRegionScheduler {
+@@ -263,6 +279,9 @@ public final class TickRegionScheduler {
          private ThreadedRegionizer.ThreadedRegion<TickRegions.TickRegionData, TickRegions.TickRegionSectionData> currentTickingRegion;
          private RegionizedWorldData currentTickingWorldRegionizedData;
-         private SchedulerThreadPool.SchedulableTick currentTickingTask;
+         private SchedulableTick currentTickingTask;
 +        // Folia start - profiler
 +        private ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle profiler = ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle.NO_OP_HANDLE;
 +        // Folia end - profiler
 
-         public TickThreadRunner(final Runnable run, final String name) {
-             super(run, name);
+         public TickThreadRunner(final ThreadGroup group, final Runnable run, final String name) {
+             super(group, run, name);
 diff --git a/io/papermc/paper/threadedregions/TickRegions.java b/io/papermc/paper/threadedregions/TickRegions.java
-index 312a98beecb95153cd10424c1c44f0d5e97a87d8..e61fbf9fbb9330087e49f92117aa0e8bad3770f6 100644
+index 40d2883d86a43175b49260bd2cb17459cc329639..4cae0a644bc979c1efeb784adff0f49dab3c6bef 100644
 --- a/io/papermc/paper/threadedregions/TickRegions.java
 +++ b/io/papermc/paper/threadedregions/TickRegions.java
-@@ -82,6 +82,11 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
+@@ -103,6 +103,11 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
      @Override
      public void onRegionDestroy(final ThreadedRegionizer.ThreadedRegion<TickRegionData, TickRegionSectionData> region) {
          // nothing for now
@@ -1120,7 +1120,7 @@ index 312a98beecb95153cd10424c1c44f0d5e97a87d8..e61fbf9fbb9330087e49f92117aa0e8b
      }
 
      @Override
-@@ -104,13 +109,23 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
+@@ -125,13 +130,23 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
      @Override
      public void preMerge(final ThreadedRegionizer.ThreadedRegion<TickRegionData, TickRegionSectionData> from,
                           final ThreadedRegionizer.ThreadedRegion<TickRegionData, TickRegionSectionData> into) {
@@ -1146,16 +1146,16 @@ index 312a98beecb95153cd10424c1c44f0d5e97a87d8..e61fbf9fbb9330087e49f92117aa0e8b
      }
 
      public static final class TickRegionSectionData implements ThreadedRegionizer.ThreadedRegionSectionData {}
-@@ -168,6 +183,8 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
-         // async-safe read-only region data
-         private final RegionStats regionStats;
+@@ -191,6 +206,8 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
+ 
+         private final AtomicBoolean hasPackets = new AtomicBoolean(false);
 
 +        public volatile ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle profiler; // Folia - profiler
 +
          private TickRegionData(final ThreadedRegionizer.ThreadedRegion<TickRegionData, TickRegionSectionData> region) {
              this.region = region;
              this.world = region.regioniser.world;
-@@ -373,13 +390,29 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
+@@ -450,13 +467,29 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
              return this.region.region.markNotTicking();
          }
 
@@ -1179,16 +1179,16 @@ index 312a98beecb95153cd10424c1c44f0d5e97a87d8..e61fbf9fbb9330087e49f92117aa0e8b
          }
 
          @Override
-         protected boolean runRegionTasks(final BooleanSupplier canContinue) {
+         protected void runRegionTasks(final BooleanSupplier canContinue) {
 +            final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle profiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler(); // Folia start - profiler
 +            profiler.startInBetweenTick(); try { // Folia - profiler
              final RegionizedTaskQueue.RegionTaskQueueData queue = this.region.taskQueueData;
 
              boolean processedChunkTask = false;
-@@ -400,6 +433,7 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
+@@ -476,6 +509,7 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
+                 // if we processed any chunk tasks, try to process ticket level updates for full status changes
                  this.region.world.moonrise$getChunkTaskScheduler().chunkHolderManager.processTicketUpdates();
              }
-             return true;
 +            } finally { profiler.stopInBetweenTick(); } // Folia - profiler
          }
 
@@ -1446,7 +1446,7 @@ index 0000000000000000000000000000000000000000..08a0f331ac8895acb1d0fe163d85037c
 +    }
 +}
 diff --git a/net/minecraft/network/PacketProcessor.java b/net/minecraft/network/PacketProcessor.java
-index 406849772f764eb5f5f986ea5e3e0213f83b3255..758cb258a7e0478bfaacfc1b6c93ce8a501b0e6c 100644
+index f9300b9f8d15843dae8fd73ff066e4be99b60451..e07e5eced7e32d1c3a0ac14e8639c1f19b0f641a 100644
 --- a/net/minecraft/network/PacketProcessor.java
 +++ b/net/minecraft/network/PacketProcessor.java
 @@ -103,7 +103,10 @@ public class PacketProcessor implements AutoCloseable {
@@ -1461,7 +1461,7 @@ index 406849772f764eb5f5f986ea5e3e0213f83b3255..758cb258a7e0478bfaacfc1b6c93ce8a
                      if (var3 instanceof ReportedException reportedException && reportedException.getCause() instanceof OutOfMemoryError) {
                          throw PacketUtils.makeReportedException(var3, this.packet, this.listener);
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index ae5ef245999e456612edc6c566e8a8c302684fb7..bcbce98f97169f98053badeabf2d20f3a798b488 100644
+index aa2c7732749400ffaf6c0e3ff17b698959bfd5f4..9464cf735cedbf662355d9e86c37bb2851680fd6 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -1658,6 +1658,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1872,18 +1872,18 @@ index dd140762829f7311e04263e3ebf29e68192b8b28..455e4f95efc0c27e09d41d4a4deff5ab
      }
 
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index ef90696df3fa0f6b29a76addac256c64da0f571f..2dcd7ece555d2343cc734097831787d29309f070 100644
+index 791cd313abcd2d98c8cf356211e539a714e951ad..9eff0ae2bc1024ecddb646faf767d969bb8950e8 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -1023,6 +1023,7 @@ public abstract class PlayerList {
+@@ -1024,6 +1024,7 @@ public abstract class PlayerList {
 
      public void saveAll(final int interval) {
          io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
 +        final ca.spottedleaf.leafprofiler.RegionizedProfiler.Handle profiler = io.papermc.paper.threadedregions.TickRegionScheduler.getProfiler(); // Folia - profiler
          int numSaved = 0;
          final long now = System.nanoTime(); // Folia - region threading
          long timeInterval = (long)interval * io.papermc.paper.threadedregions.TickRegionScheduler.TIME_BETWEEN_TICKS; // Folia - region threading
-@@ -1033,7 +1034,9 @@ public abstract class PlayerList {
+@@ -1034,7 +1035,9 @@ public abstract class PlayerList {
              }
              // Folia end - region threading
              if (interval == -1 || now - player.lastSave >= timeInterval) { // Folia - region threading
@@ -1938,7 +1938,7 @@ index abccad13c2bb3a33e98ad8eb6d7f08c0ef021811..0590d5723854a03a59fe9471710802f4
          }
      }
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index 9f7fa145f7f6a765c668dc7754626a91bef4ce6a..6809547216f9767d600cc4bf0bff43d572161417 100644
+index 38a7af35f2e77b36d6b32ed40d0aaf7cd79440f2..dd66bd2d10b4ed98ed72112f3d0505d66539c831 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
 @@ -194,6 +194,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl

folia-server/minecraft-patches/features/0007-Region-profiler.patch

@@ -117,41 +117,40 @@ index 0000000000000000000000000000000000000000..e9ca1a15049b0211d10401cb78e953b9
 +    }
 +}
 diff --git a/io/papermc/paper/threadedregions/TickRegionScheduler.java b/io/papermc/paper/threadedregions/TickRegionScheduler.java
-index 94cffb77dd8aeb8329ec89d94c8709a2b67a5513..e7a1a4cd49c65296e3235b9ba1eeaa28c5a275d2 100644
+index 9772d0f7b003de2544210c5e11f7a8c8feaf0cdd..a121c71e953eff821cb1655045b60221deed46b1 100644
 --- a/io/papermc/paper/threadedregions/TickRegionScheduler.java
 +++ b/io/papermc/paper/threadedregions/TickRegionScheduler.java
-@@ -36,6 +36,13 @@ public final class TickRegionScheduler {
+@@ -41,6 +41,12 @@ public final class TickRegionScheduler {
+ 
      public static final int TICK_RATE = 20;
      public static final long TIME_BETWEEN_TICKS = 1_000_000_000L / TICK_RATE; // ns
- 
 +    // Folia start - watchdog
 +    public static final FoliaWatchdogThread WATCHDOG_THREAD = new FoliaWatchdogThread();
 +    static {
 +        WATCHDOG_THREAD.start();
 +    }
 +    // Folia end - watchdog
-+
-     private final SchedulerThreadPool scheduler;
 
-     public TickRegionScheduler(final int threads) {
-@@ -325,6 +332,8 @@ public final class TickRegionScheduler {
+     private final Scheduler scheduler;
+ 
+@@ -382,6 +388,8 @@ public final class TickRegionScheduler {
+                 this.currentTickingThread = Thread.currentThread();
              }
 
-             final boolean ret;
 +            final FoliaWatchdogThread.RunningTick runningTick = new FoliaWatchdogThread.RunningTick(tickStart, this, Thread.currentThread()); // Folia - watchdog
 +            WATCHDOG_THREAD.addTick(runningTick); // Folia - watchdog
              try {
-                 ret = this.runRegionTasks(() -> {
+                 this.runRegionTasks(() -> {
                      return !RegionScheduleHandle.this.cancelled.get() && canContinue.getAsBoolean();
-@@ -334,6 +343,7 @@ public final class TickRegionScheduler {
+@@ -391,6 +399,7 @@ public final class TickRegionScheduler {
                  // don't release region for another tick
-                 return null;
+                 return false;
              } finally {
 +                WATCHDOG_THREAD.removeTick(runningTick); // Folia - watchdog
                  final long tickEnd = System.nanoTime();
                  final long cpuEnd = MEASURE_CPU_TIME ? THREAD_MX_BEAN.getCurrentThreadCpuTime() : 0L;
 
-@@ -397,6 +407,8 @@ public final class TickRegionScheduler {
+@@ -464,6 +473,8 @@ public final class TickRegionScheduler {
                  this.currentTickingThread = Thread.currentThread();
              }
 
@@ -160,7 +159,7 @@ index 94cffb77dd8aeb8329ec89d94c8709a2b67a5513..e7a1a4cd49c65296e3235b9ba1eeaa28
              try {
                  // next start isn't updated until the end of this tick
                  this.tickRegion(tickCount, tickStart, scheduledEnd);
-@@ -405,6 +417,7 @@ public final class TickRegionScheduler {
+@@ -472,6 +483,7 @@ public final class TickRegionScheduler {
                  // regionFailed will schedule a shutdown, so we should avoid letting this region tick further
                  return false;
              } finally {
@@ -169,10 +168,10 @@ index 94cffb77dd8aeb8329ec89d94c8709a2b67a5513..e7a1a4cd49c65296e3235b9ba1eeaa28
                  final long cpuEnd = MEASURE_CPU_TIME ? THREAD_MX_BEAN.getCurrentThreadCpuTime() : 0L;
 
 diff --git a/io/papermc/paper/threadedregions/TickRegions.java b/io/papermc/paper/threadedregions/TickRegions.java
-index e61fbf9fbb9330087e49f92117aa0e8bad3770f6..7f3bd370ee505d0f66281cdbd87d9dd43b936bb8 100644
+index 4cae0a644bc979c1efeb784adff0f49dab3c6bef..cf65aece53f7a1398b8e7dba527901444146a631 100644
 --- a/io/papermc/paper/threadedregions/TickRegions.java
 +++ b/io/papermc/paper/threadedregions/TickRegions.java
-@@ -331,9 +331,9 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
+@@ -408,9 +408,9 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks<Tic
          }
      }