Misc fixes to tick reporting (#13174)

Author: jpenilla

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

@@ -23030,7 +23030,7 @@ index e7510be12644b2edd966c538c84379a3d5fe89b5..8d299a75c80fddc61a2aa4dc5b0dc594
                  thread1 -> {
                      DedicatedServer dedicatedServer1 = new DedicatedServer(
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index c62892b4656366fbeb65847fbeec95965e49c767..4d074f6f3c123f6ee6c63dbc37732d67ab964e4e 100644
+index af1cb905d55290e3d01b419f5b03246e019f3147..c8e0071e7f0e70756ddd0f8b1073e49980f7f4d4 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -177,7 +177,7 @@ import net.minecraft.world.phys.Vec2;
@@ -23042,7 +23042,7 @@ index c62892b4656366fbeb65847fbeec95965e49c767..4d074f6f3c123f6ee6c63dbc37732d67
      private static MinecraftServer SERVER; // Paper
      public static final Logger LOGGER = LogUtils.getLogger();
      public static final net.kyori.adventure.text.logger.slf4j.ComponentLogger COMPONENT_LOGGER = net.kyori.adventure.text.logger.slf4j.ComponentLogger.logger(LOGGER.getName()); // Paper
-@@ -370,6 +370,93 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -375,6 +375,93 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return minecraftServer;
      }
 
@@ -23136,7 +23136,7 @@ index c62892b4656366fbeb65847fbeec95965e49c767..4d074f6f3c123f6ee6c63dbc37732d67
      public MinecraftServer(
          // CraftBukkit start
          joptsimple.OptionSet options,
-@@ -800,7 +887,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -805,7 +892,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          serverLevel.setSpawnSettings(serverLevel.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && serverLevel.getGameRules().getBoolean(GameRules.RULE_SPAWN_MONSTERS)); // Paper - per level difficulty (from setDifficulty(ServerLevel, Difficulty, boolean))
          this.updateEffectiveRespawnData();
          this.forceTicks = false; // CraftBukkit
@@ -23145,7 +23145,7 @@ index c62892b4656366fbeb65847fbeec95965e49c767..4d074f6f3c123f6ee6c63dbc37732d67
          new org.bukkit.event.world.WorldLoadEvent(serverLevel.getWorld()).callEvent(); // Paper - call WorldLoadEvent
      }
 
-@@ -823,6 +910,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -828,6 +915,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public abstract boolean shouldRconBroadcast();
 
      public boolean saveAllChunks(boolean suppressLogs, boolean flush, boolean force) {
@@ -23157,7 +23157,7 @@ index c62892b4656366fbeb65847fbeec95965e49c767..4d074f6f3c123f6ee6c63dbc37732d67
          boolean flag = false;
 
          for (ServerLevel serverLevel : this.getAllLevels()) {
-@@ -830,7 +922,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -835,7 +927,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  LOGGER.info("Saving chunks for level '{}'/{}", serverLevel, serverLevel.dimension().location());
              }
 
@@ -23166,7 +23166,7 @@ index c62892b4656366fbeb65847fbeec95965e49c767..4d074f6f3c123f6ee6c63dbc37732d67
              flag = true;
          }
 
-@@ -920,7 +1012,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -925,7 +1017,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
 
@@ -23175,7 +23175,7 @@ index c62892b4656366fbeb65847fbeec95965e49c767..4d074f6f3c123f6ee6c63dbc37732d67
              this.nextTickTimeNanos = Util.getNanos() + TimeUtil.NANOSECONDS_PER_MILLISECOND;
 
              for (ServerLevel serverLevelx : this.getAllLevels()) {
-@@ -930,18 +1022,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -935,18 +1027,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
              this.waitUntilNextTick();
          }
@@ -23201,7 +23201,7 @@ index c62892b4656366fbeb65847fbeec95965e49c767..4d074f6f3c123f6ee6c63dbc37732d67
 
          this.isSaving = false;
          this.resources.close();
-@@ -961,6 +1049,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -966,6 +1054,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.services().nameToIdCache().save(false); // Paper - Perf: Async GameProfileCache saving
          }
          // Spigot end
@@ -23216,7 +23216,7 @@ index c62892b4656366fbeb65847fbeec95965e49c767..4d074f6f3c123f6ee6c63dbc37732d67
          // Paper start - Improved watchdog support - move final shutdown items here
          Util.shutdownExecutors();
          try {
-@@ -1053,16 +1149,31 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1058,16 +1154,31 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              // execute small amounts of other tasks just in case the number of tasks we are
              // draining is large - chunk system and packet processing may be latency sensitive
 
@@ -23251,7 +23251,7 @@ index c62892b4656366fbeb65847fbeec95965e49c767..4d074f6f3c123f6ee6c63dbc37732d67
          profiler.pop(); // moonrise:run_all_chunk
          profiler.pop(); // moonrise:run_all_tasks
 
-@@ -1203,11 +1314,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1208,11 +1319,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      ProfilerFiller profilerFiller = Profiler.get();
                      profilerFiller.push("tick");
                      this.tickFrame.start();
@@ -23270,15 +23270,15 @@ index c62892b4656366fbeb65847fbeec95965e49c767..4d074f6f3c123f6ee6c63dbc37732d67
                      this.tickFrame.end();
                      this.recordEndOfTick(); // Paper - improve tick loop
                      profilerFiller.popPush("nextTickWait");
-@@ -1380,6 +1495,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1385,6 +1500,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
      private boolean pollTaskInternal() {
          if (super.pollTask()) {
 +            this.moonrise$executeMidTickTasks(); // Paper - rewrite chunk system
              return true;
          } else {
              boolean ret = false; // Paper - force execution of all worlds, do not just bias the first
-@@ -2555,6 +2671,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2560,6 +2676,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
 

paper-server/patches/features/0002-Rewrite-dataconverter-system.patch

@@ -32910,10 +32910,10 @@ index 71b8bbeda2fecf930870a9b6e856e20639d31645..91650a92a21fcaac65a5dfcac0cc856b
          return structureTemplate.save(new CompoundTag());
      }
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 4d074f6f3c123f6ee6c63dbc37732d67ab964e4e..ff9f7acdd99b57dde99ab132fb089c3aabb68436 100644
+index c8e0071e7f0e70756ddd0f8b1073e49980f7f4d4..5e0dbc0393fd507608417bec95e6247673486993 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -356,6 +356,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -361,6 +361,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // Paper end - improve tick loop
 
      public static <S extends MinecraftServer> S spin(Function<Thread, S> threadFunction) {

paper-server/patches/features/0021-Incremental-chunk-and-player-saving.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Incremental chunk and player saving
 
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index ff9f7acdd99b57dde99ab132fb089c3aabb68436..cc9a4f00cd86a8c5208695aa730ce8e84ab0ed3f 100644
+index 5e0dbc0393fd507608417bec95e6247673486993..61feaa8ed0b80797286f69a2a9ad5af47b21c8b5 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -946,7 +946,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -951,7 +951,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          boolean var4;
          try {
              this.isSaving = true;
@@ -17,7 +17,7 @@ index ff9f7acdd99b57dde99ab132fb089c3aabb68436..cc9a4f00cd86a8c5208695aa730ce8e8
              var4 = this.saveAllChunks(suppressLogs, flush, force);
          } finally {
              this.isSaving = false;
-@@ -1603,9 +1603,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1608,9 +1608,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
 
          this.ticksUntilAutosave--;

paper-server/patches/features/0026-Optimise-EntityScheduler-ticking.patch

@@ -20,10 +20,10 @@ index a2fbc13105673e926cbaed69221826ebd392140f..a42938e1abd371dba6806e65552fde71
 
      @Override
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index cc9a4f00cd86a8c5208695aa730ce8e84ab0ed3f..5d268ad1211fe936813f8195ae3e82265595f359 100644
+index 61feaa8ed0b80797286f69a2a9ad5af47b21c8b5..d0265d6fa88296911a2c22ab736e37a9e85abc76 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1717,33 +1717,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1722,33 +1722,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
 

paper-server/patches/features/0029-Optimize-Hoppers.patch

@@ -48,10 +48,10 @@ index 0000000000000000000000000000000000000000..24a2090e068ad3c0d08705050944abdf
 +    }
 +}
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 5d268ad1211fe936813f8195ae3e82265595f359..806184fac2b7fcb5b8cb3adc9b212bdc475699e9 100644
+index d0265d6fa88296911a2c22ab736e37a9e85abc76..ae981e1e2b347d52b2ce684aac70f5382e2efcf1 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1772,6 +1772,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1777,6 +1777,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              serverLevel.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
              serverLevel.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
              serverLevel.updateLagCompensationTick(); // Paper - lag compensation

paper-server/patches/sources/net/minecraft/server/MinecraftServer.java.patch

@@ -41,7 +41,7 @@
      private int playerIdleTimeout;
      private final long[] tickTimesNanos = new long[100];
      private long aggregatedTickTimesNanos = 0L;
-@@ -278,10 +_,86 @@
+@@ -278,10 +_,91 @@
      private final DiscontinuousFrame tickFrame;
      private final PacketProcessor packetProcessor;
 
@@ -70,7 +70,7 @@
 +    // Paper start - improve tick loop
 +    public final ca.spottedleaf.moonrise.common.time.TickData tickTimes1s  = new ca.spottedleaf.moonrise.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(1L));
 +    public final ca.spottedleaf.moonrise.common.time.TickData tickTimes5s  = new ca.spottedleaf.moonrise.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(5L));
-+    public @Nullable ca.spottedleaf.moonrise.common.time.TickData.TickReportData tickReport5s;
++    private volatile @Nullable ca.spottedleaf.moonrise.common.time.TickData.TickReportData tickReport5s;
 +    public final ca.spottedleaf.moonrise.common.time.TickData tickTimes10s = new ca.spottedleaf.moonrise.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(10L));
 +    public final ca.spottedleaf.moonrise.common.time.TickData tickTimes15s = new ca.spottedleaf.moonrise.common.time.TickData(java.util.concurrent.TimeUnit.SECONDS.toNanos(15L));
 +    public final ca.spottedleaf.moonrise.common.time.TickData tickTimes1m  = new ca.spottedleaf.moonrise.common.time.TickData(java.util.concurrent.TimeUnit.MINUTES.toNanos(1L));
@@ -82,9 +82,10 @@
 +    private long lastTickStart;
 +    private long currentTickStart;
 +    private long scheduledTickStart;
-+    private double[] tps = new double[]{0.0, 0.0, 0.0};
++    private volatile double[] tps = new double[]{0.0, 0.0, 0.0};
 +
 +    private void addTickTime(final ca.spottedleaf.moonrise.common.time.TickTime time) {
++        org.spigotmc.AsyncCatcher.catchOp("addTickTime");
 +        this.tickTimes1s.addDataFrom(time);
 +        this.tickTimes5s.addDataFrom(time);
 +        this.tickReport5s = this.tickTimes5s.generateTickReport(null, System.nanoTime(), this.tickRateManager().nanosecondsPerTick());
@@ -106,7 +107,11 @@
 +    }
 +
 +    public double[] getTPS() {
-+        return this.tps;
++        return this.tps.clone();
++    }
++
++    public @Nullable ca.spottedleaf.moonrise.common.time.TickData.TickReportData getTickReport5s() {
++        return this.tickReport5s;
 +    }
 +
 +    public double[] computeTPS() {

paper-server/src/main/java/ca/spottedleaf/moonrise/common/time/TickData.java

@@ -104,11 +104,11 @@ private static record TickInformation(
     ) {}
 
     public TickReportData generateTickReport(final TickTime inProgress, final long endTime, final long tickInterval) {
-        return this.generateTickReport(inProgress, endTime, tickInterval, true);
+        return this.generateTickReport(inProgress, endTime, tickInterval, false);
     }
 
     // rets null if there is no data
-    public TickReportData generateTickReport(final TickTime inProgress, final long endTime, final long tickInterval, final boolean trimLast) {
+    public TickReportData generateTickReport(final TickTime inProgress, final long endTime, final long tickInterval, final boolean createFakeTick) {
         if (this.timeData.isEmpty() && inProgress == null) {
             return null;
         }
@@ -187,7 +187,7 @@ public TickReportData generateTickReport(final TickTime inProgress, final long e
                             (last.supportCPUTime() ? last.tickCpuTime() : 0L) + totalCpuTime
                         )
                     );
-                } else {
+                } else if (createFakeTick) {
                     // we do not have a tick to collapse into, so we must make one up
                     // we will assume that the tick is "starting now" and ongoing
 
@@ -219,12 +219,8 @@ public TickReportData generateTickReport(final TickTime inProgress, final long e
         }
 
 
-        if (trimLast) {
-            // Avoid skewing data with task execution time of in-progress tick
-            collapsedData.removeLast();
-            if (collapsedData.isEmpty()) {
-                return null;
-            }
+        if (collapsedData.isEmpty()) {
+            return null;
         }
 
         final int collectedTicks = collapsedData.size();

paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java

@@ -2695,13 +2695,13 @@ public UnsafeValues getUnsafe() {
 
     @Override
     public long[] getTickTimes() {
-        final TickData.TickReportData reportData = this.getServer().tickReport5s;
-        return reportData == null ? new long[0] : reportData.timePerTickData().rawData();
+        final TickData.TickReportData reportData = this.getServer().getTickReport5s();
+        return reportData == null ? new long[0] : reportData.timePerTickData().rawData().clone();
     }
 
     @Override
     public double getAverageTickTime() {
-        final TickData.TickReportData reportData = this.getServer().tickReport5s;
+        final TickData.TickReportData reportData = this.getServer().getTickReport5s();
         return reportData == null ? 0.0 : reportData.timePerTickData().segmentAll().average() * 1.0E-6D;
     }