Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-17 03:50:08 +01:00
Code Issues Projekte Releases Wiki Aktivität
0318e62b45
Paper/Spigot-Server-Patches/0397-Use-more-reasonable-thread-count-default-for-bootstr.patch

23 Zeilen
1.2 KiB
Diff
Originalformat Normale Ansicht Verlauf

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: 0969eedc Clarify furnace burn time behaviour as per SPIGOT-844 16453bfd SPIGOT-4503: Add API to insert complete ItemStack into Jukebox CraftBukkit Changes: dff66dfc Reduce copying of positions from block states 91cae6ef SPIGOT-4387: Durability looping from cancelled BlockPlaceEvent 24c5e68c SPIGOT-4493: Allow burnt out furnaces to remain lit like Vanilla whilst retaining SPIGOT-844 API bc943daf Fix Jukebox API not synchronizing playing data with state fe89a8c1 SPIGOT-4503: Add API to insert complete ItemStack into Jukebox fc102494 Make CraftBlockState use BlockPosition 89ab4887 SPIGOT-4543: Jukebox playing calls should not use legacy data 6ff5a64c SPIGOT-4541: Cancelled bucket events require inventory update
2018-12-23 18:04:13 +01:00
From 4a703c9cefecaf88cd005f9895443ba79faf61d8 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
diff --git a/src/main/java/net/minecraft/server/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java
Make scan-for-legacy-ender-dragon config work again Portion of diff was dropped in the mappings update commit. Also remove the option to remove invalid statistics. The server will automatically do this now as of... 1.13?, our option wasn't even doing anything.
2018-12-15 02:17:27 +01:00
index 13f237ec4..012d878cb 100644
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
--- a/src/main/java/net/minecraft/server/DataConverterRegistry.java
+++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java
@@ -22,7 +22,7 @@ public class DataConverterRegistry {
a(datafixerbuilder);
// CraftBukkit start
- ForkJoinPool pool = new ForkJoinPool(Integer.getInteger("net.minecraft.server.DataConverterRegistry.bootstrapThreads", Math.min(Runtime.getRuntime().availableProcessors(), 2)));
Use at minimum 2 threads for Data fixers Per MC-138093 comments, ForkJoinPool uses unlimited threads if parallelism is ever 1. A 2 core machine will end up with 1 with the change I had previously made, so bumped the min to 2 so we will never trigger the unlimited thread situation. This aligns the min back with Spigot, but allows use of more threads on systems with more cores.
2018-11-05 23:25:08 +01:00
+ ForkJoinPool pool = new ForkJoinPool(Integer.getInteger("net.minecraft.server.DataConverterRegistry.bootstrapThreads", Math.min(6, Math.max(Runtime.getRuntime().availableProcessors() - 2, 2)))); // Paper - use more reasonable default - 2 is hard minimum to avoid using unlimited threads
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
DataFixer fixer = datafixerbuilder.build(pool);
pool.shutdown();
return fixer;
--
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: 0969eedc Clarify furnace burn time behaviour as per SPIGOT-844 16453bfd SPIGOT-4503: Add API to insert complete ItemStack into Jukebox CraftBukkit Changes: dff66dfc Reduce copying of positions from block states 91cae6ef SPIGOT-4387: Durability looping from cancelled BlockPlaceEvent 24c5e68c SPIGOT-4493: Allow burnt out furnaces to remain lit like Vanilla whilst retaining SPIGOT-844 API bc943daf Fix Jukebox API not synchronizing playing data with state fe89a8c1 SPIGOT-4503: Add API to insert complete ItemStack into Jukebox fc102494 Make CraftBlockState use BlockPosition 89ab4887 SPIGOT-4543: Jukebox playing calls should not use legacy data 6ff5a64c SPIGOT-4541: Cancelled bucket events require inventory update
2018-12-23 18:04:13 +01:00
2.20.1
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
In neuem Issue referenzieren Permalink kopieren