OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 04:02:50 +01:00
Code Issues Projects Releases Packages Wiki Activity
PaperMC/Spigot-Server-Patches/0459-Increase-Light-Queue-Size.patch

46 lines
2 KiB
Diff
Raw Normal View History

Optimize Network Manager to not need synchronization Removes synchronization from sending packets Makes normal packet sends no longer need to be wrapped and queued like it use to work. Adds more packet queue immunities on top of keep alive to let the following scenarios go out without delay: - Keep Alive - Chat - Kick - All of the packets during the Player Joined World event Hoping that latter one helps join timeout issues more too for slow connections. Removes processing packet queue off of main thread - for the few cases where it is allowed, order is not necessary nor should it even be happening concurrently in first place (handshaking/login/status) Ensures packets sent asynchronously are dispatched on main thread This helps ensure safety for ProtocolLib as packet listeners are commonly accessing world state. This will allow you to schedule a packet to be sent async, but itll be dispatched sync for packet listeners to process. This should solve some deadlock risks This may provide a decent performance improvement because thread synchronization incurs a cache reset so by avoiding ever entering a synchronized block, we get to avoid that, and packet sending is a really hot activity.
2020-05-06 11:22:03 +02:00
From 238da0bfbafde5fadcba5d39613c28eeb68e5e82 Mon Sep 17 00:00:00 2001
Increase Light Queue Size Wiz mentioned that large WorldEdit operations cause light to run on main thread. The queue was small, set to 5.. this bumps it to 20 but makes it configurable per-world. The main risk of increasing this higher is during shutdown, some queued light updates may be lost because mojang did not flush the light engine on shutdown... The queue size only puts a cap on max loss, doesn't solve that problem. Don't touch this unless you know you have a problem and ok with the risk.
2020-04-09 03:36:10 +02:00
From: Aikar <aikar@aikar.co>
Date: Wed, 8 Apr 2020 21:24:05 -0400
Subject: [PATCH] Increase Light Queue Size
Wiz mentioned that large WorldEdit operations cause light to run on
main thread. The queue was small, set to 5.. this bumps it to 20
but makes it configurable per-world.
The main risk of increasing this higher is during shutdown, some
queued light updates may be lost because mojang did not flush the
light engine on shutdown...
The queue size only puts a cap on max loss, doesn't solve that problem.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
Anti Xray cleanup Undo the accidental renaming of a method in 0aad8bf Aikar wanted to rename DataPalette#getDataBits(T object) to getOrCreateIdFor in 0aad8bf but he also accidentally renamed ChunkPacketInfo#getDataBitsIndex(int chunkSectionIndex) to getOrCreateIdForIndex. Remove chunk-edge-mode and chunk loading entirely from Anti-Xray The chunk-edge-mode is broken since several versions. Loading chunk neighbors for chunk edge obfuscation isn't needed anymore. Unlike in previous versions, these are under normal circumstances already loaded at the time we need them (plugins for example can bypass this). Use the modified methods and constructors everywhere Anti-Xray provides support for the default nms methods and constructors, which where modified by Anti-Xray to avoid breaking stuff (plugins) which somehow uses these methods. However, the modified versions of those methods and constructors should be used where possible.
2020-05-06 10:35:20 +02:00
index 3f44be577e3..a4815f5e69c 100644
Increase Light Queue Size Wiz mentioned that large WorldEdit operations cause light to run on main thread. The queue was small, set to 5.. this bumps it to 20 but makes it configurable per-world. The main risk of increasing this higher is during shutdown, some queued light updates may be lost because mojang did not flush the light engine on shutdown... The queue size only puts a cap on max loss, doesn't solve that problem. Don't touch this unless you know you have a problem and ok with the risk.
2020-04-09 03:36:10 +02:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
Anti Xray cleanup Undo the accidental renaming of a method in 0aad8bf Aikar wanted to rename DataPalette#getDataBits(T object) to getOrCreateIdFor in 0aad8bf but he also accidentally renamed ChunkPacketInfo#getDataBitsIndex(int chunkSectionIndex) to getOrCreateIdForIndex. Remove chunk-edge-mode and chunk loading entirely from Anti-Xray The chunk-edge-mode is broken since several versions. Loading chunk neighbors for chunk edge obfuscation isn't needed anymore. Unlike in previous versions, these are under normal circumstances already loaded at the time we need them (plugins for example can bypass this). Use the modified methods and constructors everywhere Anti-Xray provides support for the default nms methods and constructors, which where modified by Anti-Xray to avoid breaking stuff (plugins) which somehow uses these methods. However, the modified versions of those methods and constructors should be used where possible.
2020-05-06 10:35:20 +02:00
@@ -667,4 +667,9 @@ public class PaperWorldConfig {
Use distance map to optimise entity tracker / Misc Utils Use the distance map to find candidate players for tracking. This also ports a few utility changes from Tuinity
2020-05-06 09:44:47 +02:00
private void zombieVillagerInfectionChance() {
zombieVillagerInfectionChance = getDouble("zombie-villager-infection-chance", zombieVillagerInfectionChance);
Increase Light Queue Size Wiz mentioned that large WorldEdit operations cause light to run on main thread. The queue was small, set to 5.. this bumps it to 20 but makes it configurable per-world. The main risk of increasing this higher is during shutdown, some queued light updates may be lost because mojang did not flush the light engine on shutdown... The queue size only puts a cap on max loss, doesn't solve that problem. Don't touch this unless you know you have a problem and ok with the risk.
2020-04-09 03:36:10 +02:00
}
+
+ public int lightQueueSize = 20;
+ private void lightQueueSize() {
+ lightQueueSize = getInt("light-queue-size", lightQueueSize);
+ }
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
Anti Xray cleanup Undo the accidental renaming of a method in 0aad8bf Aikar wanted to rename DataPalette#getDataBits(T object) to getOrCreateIdFor in 0aad8bf but he also accidentally renamed ChunkPacketInfo#getDataBitsIndex(int chunkSectionIndex) to getOrCreateIdForIndex. Remove chunk-edge-mode and chunk loading entirely from Anti-Xray The chunk-edge-mode is broken since several versions. Loading chunk neighbors for chunk edge obfuscation isn't needed anymore. Unlike in previous versions, these are under normal circumstances already loaded at the time we need them (plugins for example can bypass this). Use the modified methods and constructors everywhere Anti-Xray provides support for the default nms methods and constructors, which where modified by Anti-Xray to avoid breaking stuff (plugins) which somehow uses these methods. However, the modified versions of those methods and constructors should be used where possible.
2020-05-06 10:35:20 +02:00
index d1f82eff218..77adc64e30c 100644
Increase Light Queue Size Wiz mentioned that large WorldEdit operations cause light to run on main thread. The queue was small, set to 5.. this bumps it to 20 but makes it configurable per-world. The main risk of increasing this higher is during shutdown, some queued light updates may be lost because mojang did not flush the light engine on shutdown... The queue size only puts a cap on max loss, doesn't solve that problem. Don't touch this unless you know you have a problem and ok with the risk.
2020-04-09 03:36:10 +02:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
Load Spawn Chunks Asynchronously and Spiral Out Ensures absolute center is first in priority Speeds up server startup
2020-04-19 12:01:07 +02:00
@@ -637,7 +637,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
Increase Light Queue Size Wiz mentioned that large WorldEdit operations cause light to run on main thread. The queue was small, set to 5.. this bumps it to 20 but makes it configurable per-world. The main risk of increasing this higher is during shutdown, some queued light updates may be lost because mojang did not flush the light engine on shutdown... The queue size only puts a cap on max loss, doesn't solve that problem. Don't touch this unless you know you have a problem and ok with the risk.
2020-04-09 03:36:10 +02:00
this.executeModerately();
// CraftBukkit end
worldloadlistener.b();
- chunkproviderserver.getLightEngine().a(5);
+ chunkproviderserver.getLightEngine().a(worldserver.paperConfig.lightQueueSize); // Paper - increase light queue size
// CraftBukkit start
this.forceTicks = false;
--
Anti Xray cleanup Undo the accidental renaming of a method in 0aad8bf Aikar wanted to rename DataPalette#getDataBits(T object) to getOrCreateIdFor in 0aad8bf but he also accidentally renamed ChunkPacketInfo#getDataBitsIndex(int chunkSectionIndex) to getOrCreateIdForIndex. Remove chunk-edge-mode and chunk loading entirely from Anti-Xray The chunk-edge-mode is broken since several versions. Loading chunk neighbors for chunk edge obfuscation isn't needed anymore. Unlike in previous versions, these are under normal circumstances already loaded at the time we need them (plugins for example can bypass this). Use the modified methods and constructors everywhere Anti-Xray provides support for the default nms methods and constructors, which where modified by Anti-Xray to avoid breaking stuff (plugins) which somehow uses these methods. However, the modified versions of those methods and constructors should be used where possible.
2020-05-06 10:35:20 +02:00
2.26.2
Increase Light Queue Size Wiz mentioned that large WorldEdit operations cause light to run on main thread. The queue was small, set to 5.. this bumps it to 20 but makes it configurable per-world. The main risk of increasing this higher is during shutdown, some queued light updates may be lost because mojang did not flush the light engine on shutdown... The queue size only puts a cap on max loss, doesn't solve that problem. Don't touch this unless you know you have a problem and ok with the risk.
2020-04-09 03:36:10 +02:00
Reference in a new issue Copy permalink