Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
ef0e5a642d
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
55 Zeilen
2.8 KiB
Diff
55 Zeilen
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 12 Sep 2020 17:21:38 -0400
|
|
Subject: [PATCH] Cache DataFixerUpper Rewrite Rules on demand
|
|
|
|
Mojang precaches every single potential rewrite rule that could ever
|
|
exist on server startup. This includes rules from all the way back to versions from 6+ years ago.
|
|
|
|
This is the source of why the server hogs every CPU core at 100% every start.
|
|
|
|
For anyone who hard resets for updates or has force upgraded their entire world, this
|
|
results in completely wasted cpu cycles.
|
|
|
|
This massive CPU usage also delays server startup time.
|
|
|
|
We improve this by making "min version to precache" that defaults to a future version
|
|
so that no rewrite rules are precached.
|
|
|
|
someone who expects to be converting a lot chunks could theoretically set
|
|
-DPaper.minPrecachedDatafixVersion=<dataVersionConvertingFrom> as a startup
|
|
parameter and only build from that point on.
|
|
|
|
However this will likely never be needed as the server will still run
|
|
the same cache logic on demand when it's actually needed. The only
|
|
cost would be some delay on the FIRST chunk conversion, but paper already
|
|
runs chunk conversions on another thread so this will likely never be
|
|
a concern for TPS.
|
|
|
|
This patch will significantly reduce CPU use on startup, reduce memory usage,
|
|
and improve server startup time.
|
|
|
|
diff --git a/src/main/java/com/mojang/datafixers/DataFixerBuilder.java b/src/main/java/com/mojang/datafixers/DataFixerBuilder.java
|
|
index d25f106ab64c90438f521a2c6fa944bdedc1969a..3d5e52d997a8e7d7f3b000e3737d30762aae2ca1 100644
|
|
--- a/src/main/java/com/mojang/datafixers/DataFixerBuilder.java
|
|
+++ b/src/main/java/com/mojang/datafixers/DataFixerBuilder.java
|
|
@@ -28,8 +28,10 @@ public class DataFixerBuilder {
|
|
private final Int2ObjectSortedMap<Schema> schemas = new Int2ObjectAVLTreeMap<>();
|
|
private final List<DataFix> globalList = Lists.newArrayList();
|
|
private final IntSortedSet fixerVersions = new IntAVLTreeSet();
|
|
+ private final int minDataFixPrecacheVersion; // Paper
|
|
|
|
public DataFixerBuilder(final int dataVersion) {
|
|
+ minDataFixPrecacheVersion = Integer.getInteger("Paper.minPrecachedDatafixVersion", dataVersion+1) * 10; // Paper - default to precache nothing - mojang stores versions * 10 to allow for 'sub versions'
|
|
this.dataVersion = dataVersion;
|
|
}
|
|
|
|
@@ -74,6 +76,7 @@ public class DataFixerBuilder {
|
|
final IntBidirectionalIterator iterator = fixerUpper.fixerVersions().iterator();
|
|
while (iterator.hasNext()) {
|
|
final int versionKey = iterator.nextInt();
|
|
+ if (versionKey < minDataFixPrecacheVersion) continue; // Paper
|
|
final Schema schema = schemas.get(versionKey);
|
|
for (final String typeName : schema.types()) {
|
|
final CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
|