Style

Kotlin · Feb 21, 2022 · e79d8de · e79d8de
1 parent 0c3ba51
commit e79d8de
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/reactive/kotlinx-coroutines-rx2/src/RxScheduler.kt b/reactive/kotlinx-coroutines-rx2/src/RxScheduler.kt
@@ -50,19 +50,27 @@ private class DispatcherScheduler(@JvmField val dispatcher: CoroutineDispatcher)
      */
     private val scope = CoroutineScope(schedulerJob + dispatcher)
 
+    /**
+     * The counter of created workers, for their pretty-printing.
+     */
+    private val workerCounter = atomic(1L)
+
     override fun scheduleDirect(block: Runnable, delay: Long, unit: TimeUnit): Disposable =
         scope.scheduleTask(block, unit.toMillis(delay)) { task ->
             Runnable { scope.launch { task() } }
         }
 
-    private val workerCounter = atomic(1L)
     override fun createWorker(): Worker = DispatcherWorker(workerCounter.getAndIncrement(), dispatcher, schedulerJob)
 
     override fun shutdown() {
         schedulerJob.cancel()
     }
 
-    private class DispatcherWorker(val counter: Long, val dispatcher: CoroutineDispatcher, parentJob: Job) : Worker() {
+    private class DispatcherWorker(
+        private val counter: Long,
+        private val dispatcher: CoroutineDispatcher,
+        parentJob: Job
+    ) : Worker() {
 
         private val workerJob = SupervisorJob(parentJob)
         private val workerScope = CoroutineScope(workerJob + dispatcher)
@@ -122,6 +130,7 @@ private fun CoroutineScope.scheduleTask(
             handleUndeliverableException(e, ctx)
         }
     }
+
     val toSchedule = adaptForScheduling(::task)
     if (!isActive) return Disposables.disposed()
     if (delayMillis <= 0) {

diff --git a/reactive/kotlinx-coroutines-rx3/src/RxScheduler.kt b/reactive/kotlinx-coroutines-rx3/src/RxScheduler.kt
@@ -51,19 +51,27 @@ private class DispatcherScheduler(@JvmField val dispatcher: CoroutineDispatcher)
      */
     private val scope = CoroutineScope(schedulerJob + dispatcher)
 
+    /**
+     * The counter of created workers, for their pretty-printing.
+     */
+    private val workerCounter = atomic(1L)
+
     override fun scheduleDirect(block: Runnable, delay: Long, unit: TimeUnit): Disposable =
         scope.scheduleTask(block, unit.toMillis(delay)) { task ->
             Runnable { scope.launch { task() } }
         }
 
-    private val workerCounter = atomic(1L)
     override fun createWorker(): Worker = DispatcherWorker(workerCounter.getAndIncrement(), dispatcher, schedulerJob)
 
     override fun shutdown() {
         schedulerJob.cancel()
     }
 
-    private class DispatcherWorker(val counter: Long, val dispatcher: CoroutineDispatcher, parentJob: Job) : Worker() {
+    private class DispatcherWorker(
+        private val counter: Long,
+        private val dispatcher: CoroutineDispatcher,
+        parentJob: Job
+    ) : Worker() {
 
         private val workerJob = SupervisorJob(parentJob)
         private val workerScope = CoroutineScope(workerJob + dispatcher)
@@ -123,6 +131,7 @@ private fun CoroutineScope.scheduleTask(
             handleUndeliverableException(e, ctx)
         }
     }
+
     val toSchedule = adaptForScheduling(::task)
     if (!isActive) return Disposable.disposed()
     if (delayMillis <= 0) {