spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
spigot/CraftBukkit-Patches/0121-Replace-chunk-loading-unloading-rate-throttling.patch
md_5 e769fe4d92 Mappings Update
2018-12-06 10:00:00 +11:00

213 lines
9.1 KiB
Diff
Raw Blame History

From 6543d0fc0389960129f56b2100f83387d6ba65de Mon Sep 17 00:00:00 2001
From: Geoff Crossland <gcrossland+bukkit@gmail.com>
Date: Thu, 26 Jan 2017 20:54:55 +0000
Subject: [PATCH] Replace chunk loading / unloading rate throttling.
Uses a scheme based on estimated tick slack time.
See https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/pull-requests/71/overview
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index ea5e2f482..c1e66d314 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -262,13 +262,22 @@ public class ChunkProviderServer implements IChunkProvider {
}
}
+ private static final double UNLOAD_QUEUE_RESIZE_FACTOR = 0.96; // Spigot
+
public boolean unloadChunks(BooleanSupplier booleansupplier) {
if (!this.world.savingDisabled) {
if (!this.unloadQueue.isEmpty()) {
+ // Spigot start
+ org.spigotmc.SlackActivityAccountant activityAccountant = this.world.getMinecraftServer().slackActivityAccountant;
+ activityAccountant.startActivity(0.5);
+ int targetSize = (int) (this.unloadQueue.size() * UNLOAD_QUEUE_RESIZE_FACTOR);
+ // Spigot end
+
LongIterator longiterator = this.unloadQueue.iterator();
- for (int i = 0; longiterator.hasNext() && (booleansupplier.getAsBoolean() || i < 200 || this.unloadQueue.size() > 2000); longiterator.remove()) {
+ while (longiterator.hasNext()) { // Spigot
Long olong = (Long) longiterator.next();
+ longiterator.remove(); // Spigot
IChunkLoader ichunkloader = this.chunkLoader;
synchronized (this.chunkLoader) {
@@ -281,10 +290,15 @@ public class ChunkProviderServer implements IChunkProvider {
}
// CraftBukkit end
- ++i;
+ // Spigot start
+ if (!booleansupplier.getAsBoolean() && this.unloadQueue.size() <= targetSize && activityAccountant.activityTimeIsExhausted()) {
+ break;
+ }
+ // Spigot end
}
}
}
+ activityAccountant.endActivity(); // Spigot
}
this.chunkScheduler.a(booleansupplier);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b878cb45d..04c5c1796 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -68,6 +68,7 @@ import org.bukkit.craftbukkit.Main;
import org.bukkit.event.server.ServerLoadEvent;
// CraftBukkit end
import org.bukkit.craftbukkit.SpigotTimings; // Spigot
+import org.spigotmc.SlackActivityAccountant; // Spigot
public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStatistics, ICommandListener, Runnable {
@@ -156,6 +157,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
public static final int TICK_TIME = 1000000000 / TPS;
private static final int SAMPLE_INTERVAL = 100;
public final double[] recentTps = new double[ 3 ];
+ public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
public MinecraftServer(OptionSet options, Proxy proxy, DataFixer datafixer, CommandDispatcher commanddispatcher, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache) {
@@ -820,6 +822,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
protected void a(BooleanSupplier booleansupplier) {
SpigotTimings.serverTickTimer.startTiming(); // Spigot
+ this.slackActivityAccountant.tickStarted(); // Spigot
long i = SystemUtils.c();
++this.ticks;
@@ -880,6 +883,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
this.methodProfiler.e();
this.methodProfiler.e();
org.spigotmc.WatchdogThread.tick(); // Spigot
+ this.slackActivityAccountant.tickEnded(l); // Spigot
SpigotTimings.serverTickTimer.stopTiming(); // Spigot
org.spigotmc.CustomTimingsHandler.tick(); // Spigot
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index e163d0019..384f4f45b 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -127,8 +127,11 @@ public class PlayerChunkMap {
}
if (!this.h.isEmpty()) {
- long k = SystemUtils.c() + 50000000L;
- int l = 49;
+ // Spigot start
+ org.spigotmc.SlackActivityAccountant activityAccountant = this.world.getMinecraftServer().slackActivityAccountant;
+ activityAccountant.startActivity(0.5);
+ // Spigot end
+
Iterator iterator1 = this.h.iterator();
while (iterator1.hasNext()) {
@@ -143,8 +146,7 @@ public class PlayerChunkMap {
this.g.remove(playerchunk1);
}
- --l;
- if (l < 0 || SystemUtils.c() > k) {
+ if (activityAccountant.activityTimeIsExhausted()) { // Spigot
break;
}
}
@@ -154,6 +156,8 @@ public class PlayerChunkMap {
}
// CraftBukkit end
}
+
+ activityAccountant.endActivity(); // Spigot
}
if (!this.g.isEmpty()) {
diff --git a/src/main/java/org/spigotmc/SlackActivityAccountant.java b/src/main/java/org/spigotmc/SlackActivityAccountant.java
new file mode 100644
index 000000000..aabc7ad20
--- /dev/null
+++ b/src/main/java/org/spigotmc/SlackActivityAccountant.java
@@ -0,0 +1,78 @@
+package org.spigotmc;
+
+/**
+ * Keeps track of the time spent doing main thread activities that can be spread across ticks,
+ * so that such work doesn't exceed the current tick's estimated available slack time. Each
+ * activity is allotted a proportion of the expected slack time according to its weight, versus the
+ * estimated total weight of all activities.
+ */
+public class SlackActivityAccountant {
+ private double prevTickSlackWeightReciprocal = 1 / MIN_SLACK_WEIGHT;
+ private static final double MIN_SLACK_WEIGHT = 1 / 65536.0;
+ private double averageTickNonSlackNanos = 0;
+ private static final double AVERAGING_FACTOR = 0.375;
+
+ private long currentActivityStartNanos;
+ private static final long OFF = -1;
+ private long currentActivityEndNanos;
+ private double tickSlackWeight;
+ private long tickSlackNanos;
+
+ private double getSlackFraction(double slackWeight) {
+ return Math.min(slackWeight * this.prevTickSlackWeightReciprocal, 1);
+ }
+
+ private int getEstimatedSlackNanos() {
+ return (int) Math.max(net.minecraft.server.MinecraftServer.TICK_TIME - (long) this.averageTickNonSlackNanos, 0);
+ }
+
+ public void tickStarted() {
+ this.currentActivityStartNanos = OFF;
+ this.tickSlackWeight = 0;
+ this.tickSlackNanos = 0;
+ }
+
+ public void startActivity(double slackWeight) {
+ double slackFraction0 = getSlackFraction(this.tickSlackWeight);
+ this.tickSlackWeight += slackWeight;
+ double slackFraction1 = getSlackFraction(this.tickSlackWeight);
+
+ long t = System.nanoTime();
+ this.currentActivityStartNanos = t;
+ this.currentActivityEndNanos = t + ((int) ((slackFraction1 - slackFraction0) * this.getEstimatedSlackNanos()));
+ }
+
+ private void endActivity(long endNanos) {
+ this.tickSlackNanos += endNanos - this.currentActivityStartNanos;
+ this.currentActivityStartNanos = OFF;
+ }
+
+ public boolean activityTimeIsExhausted() {
+ if (this.currentActivityStartNanos == OFF) {
+ return true;
+ }
+
+ long t = System.nanoTime();
+ if (t <= this.currentActivityEndNanos) {
+ return false;
+ } else {
+ this.endActivity(this.currentActivityEndNanos);
+ return true;
+ }
+ }
+
+ public void endActivity() {
+ if (this.currentActivityStartNanos == OFF) {
+ return;
+ }
+
+ this.endActivity(Math.min(System.nanoTime(), this.currentActivityEndNanos));
+ }
+
+ public void tickEnded(long tickNanos) {
+ this.prevTickSlackWeightReciprocal = 1 / Math.max(this.tickSlackWeight, MIN_SLACK_WEIGHT);
+
+ long tickNonSlackNanos = tickNanos - this.tickSlackNanos;
+ this.averageTickNonSlackNanos = this.averageTickNonSlackNanos * (1 - AVERAGING_FACTOR) + tickNonSlackNanos * AVERAGING_FACTOR;
+ }
+}
--
2.19.1
Reference in a new issue View git blame Copy permalink