Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 13:06:02 +01:00
Code Issues Projects Releases Wiki Activity
bf1d217193
Paper/Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch

23 lines
912 B
Diff
Raw Normal View History

Update upstream & fix some chunk related issues (#2177) * Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears 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: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
2019-06-14 04:27:40 +02:00
From 882e8ce036296fbfebada5e46b976ec76c2d9a38 Mon Sep 17 00:00:00 2001
Improve default thread counts for DataFix BootStrap Spigot capped it to 2 threads. This bumps it back up to do maxcores -2 with a max cap of 6. A typical 4C8T system can use 6 threads and be done in 6 seconds. Server owners can use system property to override, but this improves the default.
2018-10-24 05:53:13 +02:00
From: Aikar <aikar@aikar.co>
Date: Tue, 23 Oct 2018 23:14:38 -0400
Subject: [PATCH] Use more reasonable thread count default for bootstrap
more 1.14 stuffs yay!
2019-05-05 13:12:32 +02:00
diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
2019-06-06 17:36:57 +02:00
index 5fae5a1233..6bc576f10f 100644
more 1.14 stuffs yay!
2019-05-05 13:12:32 +02:00
--- a/src/main/java/net/minecraft/server/SystemUtils.java
+++ b/src/main/java/net/minecraft/server/SystemUtils.java
Fix some issues on the list
2019-05-05 23:39:51 +02:00
@@ -66,7 +66,7 @@ public class SystemUtils {
more 1.14 stuffs yay!
2019-05-05 13:12:32 +02:00
}
Improve default thread counts for DataFix BootStrap Spigot capped it to 2 threads. This bumps it back up to do maxcores -2 with a max cap of 6. A typical 4C8T system can use 6 threads and be done in 6 seconds. Server owners can use system property to override, but this improves the default.
2018-10-24 05:53:13 +02:00
more 1.14 stuffs yay!
2019-05-05 13:12:32 +02:00
private static ExecutorService k() {
- int i = MathHelper.clamp(Runtime.getRuntime().availableProcessors() - 1, 1, 7);
+ int i = Math.min(6, Math.max(Runtime.getRuntime().availableProcessors() - 2, 2)); // Paper - use more reasonable default - 2 is hard minimum to avoid using unlimited threads
Object object;
if (i <= 0) {
Improve default thread counts for DataFix BootStrap Spigot capped it to 2 threads. This bumps it back up to do maxcores -2 with a max cap of 6. A typical 4C8T system can use 6 threads and be done in 6 seconds. Server owners can use system property to override, but this improves the default.
2018-10-24 05:53:13 +02:00
--
Correct patches
2019-05-05 13:32:20 +02:00
2.21.0
Improve default thread counts for DataFix BootStrap Spigot capped it to 2 threads. This bumps it back up to do maxcores -2 with a max cap of 6. A typical 4C8T system can use 6 threads and be done in 6 seconds. Server owners can use system property to override, but this improves the default.
2018-10-24 05:53:13 +02:00
Reference in New Issue Copy Permalink