Named all threads

Author: devgianlu

common/src/main/java/xyz/gianlu/librespot/common/NameThreadFactory.java

@@ -0,0 +1,32 @@
+package xyz.gianlu.librespot.common;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.ThreadFactory;
+
+/**
+ * @author Gianlu
+ */
+public final class NameThreadFactory implements ThreadFactory {
+    private final ThreadGroup group;
+    private final NameProvider nameProvider;
+
+    public NameThreadFactory(@NotNull NameProvider nameProvider) {
+        this.nameProvider = nameProvider;
+        SecurityManager s = System.getSecurityManager();
+        group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup();
+    }
+
+    @Override
+    public Thread newThread(@NotNull Runnable r) {
+        Thread t = new Thread(group, r, nameProvider.getName(r), 0);
+        if (t.isDaemon()) t.setDaemon(false);
+        if (t.getPriority() != Thread.NORM_PRIORITY) t.setPriority(Thread.NORM_PRIORITY);
+        return t;
+    }
+
+    public interface NameProvider {
+        @NotNull
+        String getName(@NotNull Runnable r);
+    }
+}

core/src/main/java/xyz/gianlu/librespot/core/FacebookAuthenticator.java

@@ -5,8 +5,8 @@
 import com.google.protobuf.ByteString;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
-import xyz.gianlu.librespot.common.Utils;
 import xyz.gianlu.librespot.Version;
+import xyz.gianlu.librespot.common.Utils;
 import xyz.gianlu.librespot.common.proto.Authentication;
 
 import javax.net.ssl.SSLSocketFactory;
@@ -55,7 +55,7 @@ public class FacebookAuthenticator implements Closeable {
 
     private void startPolling() throws IOException {
         polling = new HttpPolling();
-        new Thread(polling).start();
+        new Thread(polling, "facebook-auth-polling").start();
     }
 
     @NotNull

core/src/main/java/xyz/gianlu/librespot/core/PacketsManager.java

@@ -22,7 +22,7 @@ public PacketsManager(@NotNull Session session) {
         this.executorService = session.executor();
         this.queue = new LinkedBlockingQueue<>();
         this.looper = new Looper();
-        new Thread(looper).start();
+        new Thread(looper, "packets-manager-" + looper.hashCode()).start();
     }
 
     public final void dispatch(@NotNull Packet packet) {

core/src/main/java/xyz/gianlu/librespot/core/Session.java

@@ -5,6 +5,7 @@
 import org.jetbrains.annotations.NotNull;
 import xyz.gianlu.librespot.AbsConfiguration;
 import xyz.gianlu.librespot.Version;
+import xyz.gianlu.librespot.common.NameThreadFactory;
 import xyz.gianlu.librespot.common.Utils;
 import xyz.gianlu.librespot.common.proto.Authentication;
 import xyz.gianlu.librespot.common.proto.Keyexchange;
@@ -49,7 +50,7 @@ public class Session implements AutoCloseable {
     private final DataInputStream in;
     private final DataOutputStream out;
     private final Inner inner;
-    private final ExecutorService executorService = Executors.newCachedThreadPool();
+    private final ExecutorService executorService = Executors.newCachedThreadPool(new NameThreadFactory(r -> "handle-packet-" + r.hashCode()));
     private CipherPair cipherPair;
     private Receiver receiver;
     private Authentication.APWelcome apWelcome = null;
@@ -214,7 +215,7 @@ private void authenticate(@NotNull Authentication.LoginCredentials credentials)
             apWelcome = Authentication.APWelcome.parseFrom(packet.payload);
             mercuryClient = new MercuryClient(this);
             receiver = new Receiver();
-            new Thread(receiver).start();
+            new Thread(receiver, "session-packet-receiver").start();
 
             audioKeyManager = new AudioKeyManager(this);
             channelManager = new ChannelManager(this);

core/src/main/java/xyz/gianlu/librespot/core/ZeroconfAuthenticator.java

@@ -68,7 +68,7 @@ public class ZeroconfAuthenticator implements Closeable {
         this.mDnsService = new MulticastDNSService();
 
         int port = session.random.nextInt((MAX_PORT - MIN_PORT) + 1) + MIN_PORT;
-        new Thread(this.runner = new HttpRunner(port)).start();
+        new Thread(this.runner = new HttpRunner(port), "zeroconf-http-server").start();
 
         InetAddress[] bound;
         if (conf.zeroconfListenAll()) {

core/src/main/java/xyz/gianlu/librespot/player/AudioFileStreaming.java

@@ -3,6 +3,7 @@
 import com.google.protobuf.ByteString;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
+import xyz.gianlu.librespot.common.NameThreadFactory;
 import xyz.gianlu.librespot.common.Utils;
 import xyz.gianlu.librespot.common.proto.Metadata;
 import xyz.gianlu.librespot.core.Session;
@@ -25,7 +26,7 @@ public class AudioFileStreaming implements AudioFile {
     private final ByteString fileId;
     private final byte[] key;
     private final Session session;
-    private final ExecutorService executorService = Executors.newCachedThreadPool();
+    private final ExecutorService executorService = Executors.newCachedThreadPool(new NameThreadFactory(r -> "request-chunk-" + r.hashCode()));
     private int chunks = -1;
     private ChunksBuffer chunksBuffer;
 

core/src/main/java/xyz/gianlu/librespot/player/CacheManager.java

@@ -4,6 +4,7 @@
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import xyz.gianlu.librespot.common.NameThreadFactory;
 import xyz.gianlu.librespot.common.Utils;
 
 import java.io.*;
@@ -27,7 +28,7 @@ public class CacheManager {
     private final boolean enabled;
     private final Map<String, Handler> loadedHandlers;
     private final ControlTable controlTable;
-    private final ExecutorService executorService = Executors.newCachedThreadPool();
+    private final ExecutorService executorService = Executors.newCachedThreadPool(new NameThreadFactory(r -> "cache-io-" + r.hashCode()));
 
     public CacheManager(@NotNull CacheConfiguration conf) throws IOException {
         this.enabled = conf.cacheEnabled();

core/src/main/java/xyz/gianlu/librespot/player/ChannelManager.java

@@ -3,6 +3,7 @@
 import com.google.protobuf.ByteString;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
+import xyz.gianlu.librespot.common.NameThreadFactory;
 import xyz.gianlu.librespot.common.Utils;
 import xyz.gianlu.librespot.core.PacketsManager;
 import xyz.gianlu.librespot.core.Session;
@@ -28,7 +29,7 @@ public class ChannelManager extends PacketsManager {
     private static final Logger LOGGER = Logger.getLogger(ChannelManager.class);
     private final Map<Short, Channel> channels = new HashMap<>();
     private final AtomicInteger seqHolder = new AtomicInteger(0);
-    private final ExecutorService executorService = Executors.newCachedThreadPool();
+    private final ExecutorService executorService = Executors.newCachedThreadPool(new NameThreadFactory(r -> "channel-queue-" + r.hashCode()));
 
     public ChannelManager(@NotNull Session session) {
         super(session);

core/src/main/java/xyz/gianlu/librespot/player/TrackHandler.java

@@ -37,7 +37,8 @@ public class TrackHandler implements PlayerRunner.Listener, Closeable {
         this.listener = listener;
         this.feeder = new StreamFeeder(session, cacheManager);
 
-        new Thread(new Looper()).start();
+        Looper looper;
+        new Thread(looper = new Looper(), "track-handler-" + looper.hashCode()).start();
     }
 
     private void load(@NotNull TrackId id, boolean play, int pos) throws IOException, MercuryClient.MercuryException {
@@ -51,7 +52,7 @@ private void load(@NotNull TrackId id, boolean play, int pos) throws IOException
         try {
             if (playerRunner != null) playerRunner.stop();
             playerRunner = new PlayerRunner(stream.in, stream.normalizationData, lines, conf, this, track.getDuration());
-            new Thread(playerRunner).start();
+            new Thread(playerRunner, "player-runner-" + playerRunner.hashCode()).start();
 
             playerRunner.seek(pos);