Skip to content

Commit 3262f16

Browse files
JakeWhartonakarnokd
authored andcommitted
Remove double dash on RxThreadFactory thread names. (#4383)
Also optimize name creation to avoid StringBuilder having to expand its underlying char[].
1 parent 40ad57c commit 3262f16

File tree

7 files changed

+10
-13
lines changed

7 files changed

+10
-13
lines changed

src/main/java/io/reactivex/internal/schedulers/ComputationScheduler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public final class ComputationScheduler extends Scheduler {
3030
/** This will indicate no pool is active. */
3131
static final FixedSchedulerPool NONE = new FixedSchedulerPool(0);
3232
/** Manages a fixed number of workers. */
33-
private static final String THREAD_NAME_PREFIX = "RxComputationThreadPool-";
33+
private static final String THREAD_NAME_PREFIX = "RxComputationThreadPool";
3434
private static final RxThreadFactory THREAD_FACTORY = new RxThreadFactory(THREAD_NAME_PREFIX);
3535
/**
3636
* Key to setting the maximum number of computation scheduler threads.
@@ -55,7 +55,7 @@ public final class ComputationScheduler extends Scheduler {
5555
}
5656
MAX_THREADS = max;
5757

58-
SHUTDOWN_WORKER = new PoolWorker(new RxThreadFactory("RxComputationShutdown-"));
58+
SHUTDOWN_WORKER = new PoolWorker(new RxThreadFactory("RxComputationShutdown"));
5959
SHUTDOWN_WORKER.dispose();
6060
}
6161

src/main/java/io/reactivex/internal/schedulers/IoScheduler.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
* Scheduler that creates and caches a set of thread pools and reuses them if possible.
2929
*/
3030
public final class IoScheduler extends Scheduler {
31-
private static final String WORKER_THREAD_NAME_PREFIX = "RxCachedThreadScheduler-";
31+
private static final String WORKER_THREAD_NAME_PREFIX = "RxCachedThreadScheduler";
3232
private static final RxThreadFactory WORKER_THREAD_FACTORY =
3333
new RxThreadFactory(WORKER_THREAD_NAME_PREFIX);
3434

35-
private static final String EVICTOR_THREAD_NAME_PREFIX = "RxCachedWorkerPoolEvictor-";
35+
private static final String EVICTOR_THREAD_NAME_PREFIX = "RxCachedWorkerPoolEvictor";
3636
private static final RxThreadFactory EVICTOR_THREAD_FACTORY =
3737
new RxThreadFactory(EVICTOR_THREAD_NAME_PREFIX);
3838

@@ -47,7 +47,7 @@ public final class IoScheduler extends Scheduler {
4747
NONE = new CachedWorkerPool(0, null);
4848
NONE.shutdown();
4949

50-
SHUTDOWN_THREADWORKER = new ThreadWorker(new RxThreadFactory("RxCachedThreadSchedulerShutdown-"));
50+
SHUTDOWN_THREADWORKER = new ThreadWorker(new RxThreadFactory("RxCachedThreadSchedulerShutdown"));
5151
SHUTDOWN_THREADWORKER.dispose();
5252
}
5353

src/main/java/io/reactivex/internal/schedulers/NewThreadScheduler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
public final class NewThreadScheduler extends Scheduler {
2525

26-
private static final String THREAD_NAME_PREFIX = "RxNewThreadScheduler-";
26+
private static final String THREAD_NAME_PREFIX = "RxNewThreadScheduler";
2727
private static final RxThreadFactory THREAD_FACTORY = new RxThreadFactory(THREAD_NAME_PREFIX);
2828
private static final NewThreadScheduler INSTANCE = new NewThreadScheduler();
2929

src/main/java/io/reactivex/internal/schedulers/RxThreadFactory.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ public RxThreadFactory(String prefix) {
3030

3131
@Override
3232
public Thread newThread(Runnable r) {
33-
StringBuilder nameBuilder = new StringBuilder();
34-
nameBuilder.append(prefix)
35-
.append('-')
36-
.append(incrementAndGet());
33+
StringBuilder nameBuilder = new StringBuilder(prefix).append('-').append(incrementAndGet());
3734

3835
if (CREATE_TRACE) {
3936
nameBuilder.append("\r\n");

src/main/java/io/reactivex/internal/schedulers/SchedulerPoolFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static void start() {
5858
if (curr != null && !curr.isShutdown()) {
5959
return;
6060
}
61-
ScheduledExecutorService next = Executors.newScheduledThreadPool(1, new RxThreadFactory("RxSchedulerPurge-"));
61+
ScheduledExecutorService next = Executors.newScheduledThreadPool(1, new RxThreadFactory("RxSchedulerPurge"));
6262
if (PURGE_THREAD.compareAndSet(curr, next)) {
6363

6464
next.scheduleAtFixedRate(new Runnable() {

src/main/java/io/reactivex/internal/schedulers/SingleScheduler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public SingleScheduler() {
3535
}
3636

3737
static ScheduledExecutorService createExecutor() {
38-
return SchedulerPoolFactory.create(new RxThreadFactory("RxSingleScheduler-"));
38+
return SchedulerPoolFactory.create(new RxThreadFactory("RxSingleScheduler"));
3939
}
4040

4141
@Override

src/test/java/io/reactivex/schedulers/ExecutorSchedulerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
public class ExecutorSchedulerTest extends AbstractSchedulerConcurrencyTests {
3939

40-
final static Executor executor = Executors.newFixedThreadPool(2, new RxThreadFactory("TestCustomPool-"));
40+
final static Executor executor = Executors.newFixedThreadPool(2, new RxThreadFactory("TestCustomPool"));
4141

4242
@Override
4343
protected Scheduler getScheduler() {

0 commit comments

Comments
 (0)