39 lines
2.5 KiB
Diff
39 lines
2.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Brokkonaut <hannos17@gmx.de>
|
||
|
|
Date: Tue, 7 Feb 2017 16:55:35 -0600
|
||
|
|
Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||
|
|
index da97afe93a98daac33f143c6da0b42f71db25dba..5a80ea6bee72921454fbbd6ee202dc114c481ea1 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
|
||
|
|
@@ -185,7 +185,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
||
|
|
this.playerMap = new PlayerMap();
|
||
|
|
this.entityMap = new Int2ObjectOpenHashMap();
|
||
|
|
this.chunkTypeCache = new Long2ByteOpenHashMap();
|
||
|
|
- this.unloadQueue = Queues.newConcurrentLinkedQueue();
|
||
|
|
+ this.unloadQueue = new com.destroystokyo.paper.utils.CachedSizeConcurrentLinkedQueue<>(); // Paper - need constant-time size()
|
||
|
|
this.structureManager = structureManager;
|
||
|
|
this.storageFolder = session.getDimensionPath(world.dimension());
|
||
|
|
this.level = world;
|
||
|
|
@@ -478,7 +478,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
||
|
|
// Spigot start
|
||
|
|
org.spigotmc.SlackActivityAccountant activityAccountant = this.level.getServer().slackActivityAccountant;
|
||
|
|
activityAccountant.startActivity(0.5);
|
||
|
|
- int targetSize = (int) (this.toDrop.size() * ChunkMap.UNLOAD_QUEUE_RESIZE_FACTOR);
|
||
|
|
+ int targetSize = Math.min(this.toDrop.size() - 100, (int) (this.toDrop.size() * ChunkMap.UNLOAD_QUEUE_RESIZE_FACTOR)); // Paper - Make more aggressive
|
||
|
|
// Spigot end
|
||
|
|
while (longiterator.hasNext()) { // Spigot
|
||
|
|
long j = longiterator.nextLong();
|
||
|
|
@@ -500,7 +500,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
|
||
|
|
|
||
|
|
Runnable runnable;
|
||
|
|
|
||
|
|
- while ((shouldKeepTicking.getAsBoolean() || this.unloadQueue.size() > 2000) && (runnable = (Runnable) this.unloadQueue.poll()) != null) {
|
||
|
|
+ int queueTarget = Math.min(this.unloadQueue.size() - 100, (int) (this.unloadQueue.size() * UNLOAD_QUEUE_RESIZE_FACTOR)); // Paper - Target this queue as well
|
||
|
|
+ while ((shouldKeepTicking.getAsBoolean() || this.unloadQueue.size() > queueTarget) && (runnable = (Runnable)this.unloadQueue.poll()) != null) { // Paper - Target this queue as well
|
||
|
|
runnable.run();
|
||
|
|
}
|
||
|
|
|