|
| 1 | +From 93825a94b921b5da47e551571f1379fda41adf7d Mon Sep 17 00:00:00 2001 |
| 2 | + |
| 3 | +Date: Wed, 28 Sep 2022 12:46:07 +0200 |
| 4 | +Subject: [PATCH] Standardize Thread naming |
| 5 | + |
| 6 | + |
| 7 | +diff --git a/src/main/java/ga/windpvp/windspigot/async/entitytracker/AsyncEntityTracker.java b/src/main/java/ga/windpvp/windspigot/async/entitytracker/AsyncEntityTracker.java |
| 8 | +index 848f149ff..33c9079b3 100644 |
| 9 | +--- a/src/main/java/ga/windpvp/windspigot/async/entitytracker/AsyncEntityTracker.java |
| 10 | ++++ b/src/main/java/ga/windpvp/windspigot/async/entitytracker/AsyncEntityTracker.java |
| 11 | +@@ -14,7 +14,7 @@ import net.titanium.config.TitaniumConfig; |
| 12 | + |
| 13 | + public class AsyncEntityTracker extends EntityTracker { |
| 14 | + |
| 15 | +- private static final ExecutorService trackingThreadExecutor = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setNameFormat("Titanium Entity Tracker Thread").build()); |
| 16 | ++ private static final ExecutorService trackingThreadExecutor = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setNameFormat("Titanium - Entity Tracker Thread #%d").build()); |
| 17 | + private static final List<NetworkManager> disabledFlushes = Lists.newArrayList(); |
| 18 | + |
| 19 | + private final ResettableLatch latch = new ResettableLatch(TitaniumConfig.get().entityTracker.async.threads); |
| 20 | +diff --git a/src/main/java/ga/windpvp/windspigot/async/pathsearch/SearchHandler.java b/src/main/java/ga/windpvp/windspigot/async/pathsearch/SearchHandler.java |
| 21 | +index dd1276c28..8cae1fbde 100644 |
| 22 | +--- a/src/main/java/ga/windpvp/windspigot/async/pathsearch/SearchHandler.java |
| 23 | ++++ b/src/main/java/ga/windpvp/windspigot/async/pathsearch/SearchHandler.java |
| 24 | +@@ -16,7 +16,7 @@ public class SearchHandler { |
| 25 | + |
| 26 | + private static SearchHandler INSTANCE; |
| 27 | + private final ExecutorService executor = Executors.newFixedThreadPool(TitaniumConfig.get().pathSearches.async.threads, |
| 28 | +- new ThreadFactoryBuilder().setNameFormat("Titanium Entity Path Search Thread %d").build()); |
| 29 | ++ new ThreadFactoryBuilder().setNameFormat("Titanium - Entity Path Search Thread #%d").build()); |
| 30 | + |
| 31 | + public SearchHandler() { |
| 32 | + INSTANCE = this; |
| 33 | +diff --git a/src/main/java/net/minecraft/server/HttpUtilities.java b/src/main/java/net/minecraft/server/HttpUtilities.java |
| 34 | +index 4132d8bf0..84199759f 100644 |
| 35 | +--- a/src/main/java/net/minecraft/server/HttpUtilities.java |
| 36 | ++++ b/src/main/java/net/minecraft/server/HttpUtilities.java |
| 37 | +@@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger; |
| 38 | + |
| 39 | + public class HttpUtilities { |
| 40 | + |
| 41 | +- public static final ListeningExecutorService a = MoreExecutors.listeningDecorator(Executors.newCachedThreadPool((new ThreadFactoryBuilder()).setDaemon(true).setNameFormat("Downloader %d").build())); |
| 42 | ++ public static final ListeningExecutorService a = MoreExecutors.listeningDecorator(Executors.newCachedThreadPool((new ThreadFactoryBuilder()).setDaemon(true).setNameFormat("Downloader #%d").build())); |
| 43 | + private static final AtomicInteger b = new AtomicInteger(0); |
| 44 | + private static final Logger c = LogManager.getLogger(); |
| 45 | + |
| 46 | +diff --git a/src/main/java/net/minecraft/server/PacketPlayInChat.java b/src/main/java/net/minecraft/server/PacketPlayInChat.java |
| 47 | +index 18358b432..4ddc4f4b8 100644 |
| 48 | +--- a/src/main/java/net/minecraft/server/PacketPlayInChat.java |
| 49 | ++++ b/src/main/java/net/minecraft/server/PacketPlayInChat.java |
| 50 | +@@ -26,7 +26,7 @@ public class PacketPlayInChat implements Packet<PacketListenerPlayIn> { |
| 51 | + |
| 52 | + // Spigot Start |
| 53 | + private static final java.util.concurrent.ExecutorService executors = java.util.concurrent.Executors.newCachedThreadPool( |
| 54 | +- new com.google.common.util.concurrent.ThreadFactoryBuilder().setDaemon( true ).setNameFormat( "Async Chat Thread - #%d" ).build() ); |
| 55 | ++ new com.google.common.util.concurrent.ThreadFactoryBuilder().setDaemon( true ).setNameFormat( "Async Chat Thread #%d" ).build() ); |
| 56 | + public void a(final PacketListenerPlayIn packetlistenerplayin) { |
| 57 | + if ( !a.startsWith("/") ) |
| 58 | + { |
| 59 | +diff --git a/src/main/java/net/minecraft/server/PacketPlayInTabComplete.java b/src/main/java/net/minecraft/server/PacketPlayInTabComplete.java |
| 60 | +index 3440a3377..ab19be86c 100644 |
| 61 | +--- a/src/main/java/net/minecraft/server/PacketPlayInTabComplete.java |
| 62 | ++++ b/src/main/java/net/minecraft/server/PacketPlayInTabComplete.java |
| 63 | +@@ -44,7 +44,7 @@ public class PacketPlayInTabComplete implements Packet<PacketListenerPlayIn> { |
| 64 | + } |
| 65 | + |
| 66 | + // Titanium start - Async tab complete |
| 67 | +- private static final ExecutorService TAB_COMPLETION_EXECUTOR = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setDaemon(true).setNameFormat("Titanium TabComplete Thread - %d").build()); |
| 68 | ++ private static final ExecutorService TAB_COMPLETION_EXECUTOR = Executors.newCachedThreadPool(new ThreadFactoryBuilder().setDaemon(true).setNameFormat("Titanium - Tab Complete Thread #%d").build()); |
| 69 | + public void a(PacketListenerPlayIn packetlistenerplayin) { |
| 70 | + TAB_COMPLETION_EXECUTOR.submit(() -> packetlistenerplayin.a(this)); |
| 71 | + // Titanium end |
| 72 | +diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java |
| 73 | +index dc98962bd..8a2f5848d 100644 |
| 74 | +--- a/src/main/java/net/minecraft/server/TileEntitySkull.java |
| 75 | ++++ b/src/main/java/net/minecraft/server/TileEntitySkull.java |
| 76 | +@@ -27,7 +27,7 @@ public class TileEntitySkull extends TileEntity { |
| 77 | + // Spigot start |
| 78 | + public static final Executor executor = Executors.newFixedThreadPool(3, |
| 79 | + new ThreadFactoryBuilder() |
| 80 | +- .setNameFormat("Head Conversion Thread - %1$d") |
| 81 | ++ .setNameFormat("Head Conversion Thread #%d") |
| 82 | + .build() |
| 83 | + ); |
| 84 | + // Titanium start - replace guava cache with caffeine |
| 85 | +diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java |
| 86 | +index 12b40e079..584c416d9 100644 |
| 87 | +--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java |
| 88 | ++++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java |
| 89 | +@@ -40,7 +40,7 @@ public class CraftAsyncScheduler extends CraftScheduler { |
| 90 | + |
| 91 | + private final ThreadPoolExecutor executor = new ThreadPoolExecutor( |
| 92 | + 4, Integer.MAX_VALUE,30L, TimeUnit.SECONDS, new SynchronousQueue<>(), |
| 93 | +- new ThreadFactoryBuilder().setNameFormat("Craft Scheduler Thread - %1$d").build()); |
| 94 | ++ new ThreadFactoryBuilder().setNameFormat("Craft Scheduler Thread #%d").build()); |
| 95 | + private final Executor management = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder() |
| 96 | + .setNameFormat("Craft Async Scheduler Management Thread").build()); |
| 97 | + private final List<CraftTask> temp = new ArrayList<>(); |
| 98 | +-- |
| 99 | +2.36.0.windows.1 |
| 100 | + |
0 commit comments