From ff3890cc123b365589de70ae091ef478ac9f81d9 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Mon, 1 Jul 2019 16:34:02 -0400 Subject: [PATCH] Name threads more consistently. --- .../securesms/audio/AudioCodec.java | 2 +- .../securesms/audio/AudioRecorder.java | 4 ++-- .../securesms/jobmanager/JobManager.java | 2 +- .../securesms/jobmanager/JobRunner.java | 2 +- .../securesms/logging/PersistentLogger.java | 2 +- .../securesms/util/ThreadUtil.java | 19 ------------------- 6 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 src/org/thoughtcrime/securesms/util/ThreadUtil.java diff --git a/src/org/thoughtcrime/securesms/audio/AudioCodec.java b/src/org/thoughtcrime/securesms/audio/AudioCodec.java index 210daac581..b2bec170dd 100644 --- a/src/org/thoughtcrime/securesms/audio/AudioCodec.java +++ b/src/org/thoughtcrime/securesms/audio/AudioCodec.java @@ -85,7 +85,7 @@ public class AudioCodec { setFinished(); } } - }, AudioCodec.class.getSimpleName()).start(); + }, "signal-AudioCodec").start(); } private synchronized boolean isRunning() { diff --git a/src/org/thoughtcrime/securesms/audio/AudioRecorder.java b/src/org/thoughtcrime/securesms/audio/AudioRecorder.java index 00fc6da3c7..bb390f36c7 100644 --- a/src/org/thoughtcrime/securesms/audio/AudioRecorder.java +++ b/src/org/thoughtcrime/securesms/audio/AudioRecorder.java @@ -11,10 +11,10 @@ import android.util.Pair; import org.thoughtcrime.securesms.providers.BlobProvider; import org.thoughtcrime.securesms.util.MediaUtil; -import org.thoughtcrime.securesms.util.ThreadUtil; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.concurrent.ListenableFuture; import org.thoughtcrime.securesms.util.concurrent.SettableFuture; +import org.thoughtcrime.securesms.util.concurrent.SignalExecutors; import java.io.IOException; import java.util.concurrent.ExecutorService; @@ -24,7 +24,7 @@ public class AudioRecorder { private static final String TAG = AudioRecorder.class.getSimpleName(); - private static final ExecutorService executor = ThreadUtil.newDynamicSingleThreadedExecutor(); + private static final ExecutorService executor = SignalExecutors.newCachedSingleThreadExecutor("signal-AudioRecorder"); private final Context context; diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobManager.java b/src/org/thoughtcrime/securesms/jobmanager/JobManager.java index 636faa04fb..132b325280 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/JobManager.java +++ b/src/org/thoughtcrime/securesms/jobmanager/JobManager.java @@ -38,7 +38,7 @@ public class JobManager implements ConstraintObserver.Notifier { private final Set emptyQueueListeners = new CopyOnWriteArraySet<>(); public JobManager(@NonNull Application application, @NonNull Configuration configuration) { - this.executor = configuration.getExecutorFactory().newSingleThreadExecutor("JobManager"); + this.executor = configuration.getExecutorFactory().newSingleThreadExecutor("signal-JobManager"); this.jobRunners = new JobRunner[configuration.getJobThreadCount()]; this.jobController = new JobController(application, configuration.getJobStorage(), diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobRunner.java b/src/org/thoughtcrime/securesms/jobmanager/JobRunner.java index a2cf5d2079..249b4c1c60 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/JobRunner.java +++ b/src/org/thoughtcrime/securesms/jobmanager/JobRunner.java @@ -23,7 +23,7 @@ class JobRunner extends Thread { private final JobController jobController; JobRunner(@NonNull Application application, int id, @NonNull JobController jobController) { - super("JobRunner-" + id); + super("signal-JobRunner-" + id); this.application = application; this.id = id; diff --git a/src/org/thoughtcrime/securesms/logging/PersistentLogger.java b/src/org/thoughtcrime/securesms/logging/PersistentLogger.java index 17b541a990..2c04e52d31 100644 --- a/src/org/thoughtcrime/securesms/logging/PersistentLogger.java +++ b/src/org/thoughtcrime/securesms/logging/PersistentLogger.java @@ -48,7 +48,7 @@ public class PersistentLogger extends Log.Logger { this.context = context.getApplicationContext(); this.secret = LogSecretProvider.getOrCreateAttachmentSecret(context); this.executor = Executors.newSingleThreadExecutor(r -> { - Thread thread = new Thread(r, "PersistentLogger"); + Thread thread = new Thread(r, "signal-PersistentLogger"); thread.setPriority(Thread.MIN_PRIORITY); return thread; }); diff --git a/src/org/thoughtcrime/securesms/util/ThreadUtil.java b/src/org/thoughtcrime/securesms/util/ThreadUtil.java deleted file mode 100644 index df29c27306..0000000000 --- a/src/org/thoughtcrime/securesms/util/ThreadUtil.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.thoughtcrime.securesms.util; - -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - -public class ThreadUtil { - - public static ExecutorService newDynamicSingleThreadedExecutor() { - ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 60, TimeUnit.SECONDS, - new LinkedBlockingQueue()); - executor.allowCoreThreadTimeOut(true); - - return executor; - } - -}