61 Zeilen
3.3 KiB
Diff
61 Zeilen
3.3 KiB
Diff
From 26d813326fc2c7c59b2037a2b1de8b3d3db0b660 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <md_5@live.com.au>
|
|
Date: Tue, 23 Apr 2013 11:50:27 +1000
|
|
Subject: [PATCH] Thread Naming and Tweaks
|
|
|
|
Removes the sleep forever thread and adds useful names for debugging to all staged thread files.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
index b04d8a1..a271510 100644
|
|
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
@@ -34,7 +34,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
|
super(options);
|
|
// CraftBukkit end
|
|
this.l = new ConsoleLogManager("Minecraft-Server", (String) null, (String) null); // CraftBukkit - null last argument
|
|
- new ThreadSleepForever(this);
|
|
+ // new ThreadSleepForever(this);
|
|
}
|
|
|
|
protected boolean init() throws java.net.UnknownHostException { // CraftBukkit - throws UnknownHostException
|
|
diff --git a/src/main/java/net/minecraft/server/ThreadCommandReader.java b/src/main/java/net/minecraft/server/ThreadCommandReader.java
|
|
index 489e184..bfd219c 100644
|
|
--- a/src/main/java/net/minecraft/server/ThreadCommandReader.java
|
|
+++ b/src/main/java/net/minecraft/server/ThreadCommandReader.java
|
|
@@ -11,6 +11,7 @@ class ThreadCommandReader extends Thread {
|
|
final DedicatedServer server;
|
|
|
|
ThreadCommandReader(DedicatedServer dedicatedserver) {
|
|
+ super("Command Reader"); // Spigot
|
|
this.server = dedicatedserver;
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
|
|
index fb4ec7b..c15efc5 100644
|
|
--- a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
|
|
+++ b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
|
|
@@ -21,6 +21,7 @@ class ThreadLoginVerifier extends Thread {
|
|
CraftServer server;
|
|
|
|
ThreadLoginVerifier(PendingConnection pendingconnection, CraftServer server) {
|
|
+ super("Login Verifier - " + pendingconnection.getName());
|
|
this.server = server;
|
|
// CraftBukkit end
|
|
this.pendingConnection = pendingconnection;
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
|
index 0a5c61a..35badf3 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
|
@@ -70,7 +70,7 @@ public class CraftScheduler implements BukkitScheduler {
|
|
*/
|
|
private final ConcurrentHashMap<Integer, CraftTask> runners = new ConcurrentHashMap<Integer, CraftTask>();
|
|
private volatile int currentTick = -1;
|
|
- private final Executor executor = Executors.newCachedThreadPool();
|
|
+ private final Executor executor = Executors.newCachedThreadPool(new com.google.common.util.concurrent.ThreadFactoryBuilder().setNameFormat("Craft Scheduler Thread - %1$d").build()); // Spigot
|
|
private CraftAsyncDebugger debugHead = new CraftAsyncDebugger(-1, null, null) {@Override StringBuilder debugTo(StringBuilder string) {return string;}};
|
|
private CraftAsyncDebugger debugTail = debugHead;
|
|
private static final int RECENT_TICKS;
|
|
--
|
|
1.8.2.1
|
|
|