Ensure CoroutineScope.cancel() working; rename to shutdown

mamoe · May 29, 2022 · 1bdbf1c · 1bdbf1c
1 parent 6a06248
commit 1bdbf1c
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 9 deletions.
diff --git a/mirai-console/backend/mirai-console/src/MiraiConsole.kt b/mirai-console/backend/mirai-console/src/MiraiConsole.kt
@@ -246,7 +246,7 @@ public interface MiraiConsole : CoroutineScope {
          */
         @ConsoleExperimentalApi
         @JvmStatic
-        public fun shutdownConsole() {
+        public fun shutdown() {
             val consoleJob = job
             if (!consoleJob.isActive) return
             @OptIn(DelicateCoroutinesApi::class)

diff --git a/mirai-console/backend/mirai-console/src/MiraiConsoleImplementation.kt b/mirai-console/backend/mirai-console/src/MiraiConsoleImplementation.kt
@@ -400,9 +400,8 @@ public interface MiraiConsoleImplementation : CoroutineScope {
         internal suspend fun shutdown() {
             val bridge = currentBridge ?: return
             if (!bridge.isActive) return
-            if (!bridge.isShutdowning.compareAndSet(false, true)) return
+            bridge.shutdownDaemon.tryStart()
 
-            ShutdownDaemon.start()
             Bot.instances.forEach { bot ->
                 lateinit var logger: MiraiLogger
                 kotlin.runCatching {

diff --git a/mirai-console/backend/mirai-console/src/internal/MiraiConsoleImplementationBridge.kt b/mirai-console/backend/mirai-console/src/internal/MiraiConsoleImplementationBridge.kt
@@ -43,6 +43,7 @@ import net.mamoe.mirai.console.internal.logging.LoggerControllerImpl
 import net.mamoe.mirai.console.internal.logging.MiraiConsoleLogger
 import net.mamoe.mirai.console.internal.permission.BuiltInPermissionService
 import net.mamoe.mirai.console.internal.plugin.PluginManagerImpl
+import net.mamoe.mirai.console.internal.shutdown.ShutdownDaemon
 import net.mamoe.mirai.console.internal.util.runIgnoreException
 import net.mamoe.mirai.console.logging.LoggerController
 import net.mamoe.mirai.console.permission.PermissionService
@@ -86,7 +87,7 @@ internal class MiraiConsoleImplementationBridge(
 
     // used internally
     val globalComponentStorage: GlobalComponentStorageImpl by lazy { GlobalComponentStorageImpl() }
-    val isShutdowning: AtomicBoolean = AtomicBoolean(false)
+    val shutdownDaemon = ShutdownDaemon.DaemonStarter(this)
 
     // tentative workaround for https://github.com/mamoe/mirai/pull/1889#pullrequestreview-887903183
     @Volatile
@@ -149,6 +150,7 @@ internal class MiraiConsoleImplementationBridge(
             }
 
             MiraiConsole.job.invokeOnCompletion {
+                shutdownDaemon.tryStart()
                 Bot.instances.forEach { kotlin.runCatching { it.close() }.exceptionOrNull()?.let(mainLogger::error) }
             }
         }

diff --git a/mirai-console/backend/mirai-console/src/internal/shutdown/ShutdownDaemon.kt b/mirai-console/backend/mirai-console/src/internal/shutdown/ShutdownDaemon.kt
@@ -9,9 +9,12 @@
 
 package net.mamoe.mirai.console.internal.shutdown
 
+import kotlinx.coroutines.*
 import net.mamoe.mirai.console.MiraiConsole
+import net.mamoe.mirai.console.internal.MiraiConsoleImplementationBridge
 import net.mamoe.mirai.console.internal.pluginManagerImpl
 import net.mamoe.mirai.console.plugin.PluginManager.INSTANCE.description
+import net.mamoe.mirai.utils.debug
 import java.io.File
 import java.io.FileDescriptor
 import java.io.FileOutputStream
@@ -23,10 +26,25 @@ import java.time.Instant
 import java.time.ZoneOffset
 import java.util.*
 import java.util.concurrent.ConcurrentLinkedDeque
-import kotlin.concurrent.thread
+import java.util.concurrent.Executors
+import java.util.concurrent.ThreadFactory
+import java.util.concurrent.atomic.AtomicBoolean
+import java.util.concurrent.atomic.AtomicInteger
 import kotlin.io.path.writeText
 
 internal object ShutdownDaemon {
+    @Suppress("RemoveRedundantQualifierName")
+    internal class DaemonStarter(
+        private val consoleImplementationBridge: MiraiConsoleImplementationBridge
+    ) {
+        private val started = AtomicBoolean(false)
+        fun tryStart() {
+            if (started.compareAndSet(false, true)) {
+                ShutdownDaemon.start(consoleImplementationBridge)
+            }
+        }
+    }
+
     private object ThreadInfoJava9Access {
         private val isDaemonM: Method?
         private val getPriorityM: Method?
@@ -63,9 +81,30 @@ internal object ShutdownDaemon {
     private val Thread.State.isWaiting: Boolean
         get() = this == Thread.State.WAITING || this == Thread.State.TIMED_WAITING
 
-    fun start() {
+    @OptIn(DelicateCoroutinesApi::class)
+    private fun start(bridge: MiraiConsoleImplementationBridge) {
         val crtThread = Thread.currentThread()
-        thread(name = "Mirai Console Shutdown Daemon", isDaemon = true) { listen(crtThread) }
+        val isConsoleRunning = AtomicBoolean(true)
+        // 1 thread to run main daemon
+        // 1 thread to listen console shutdown running
+        // 1 thread reserved
+        val executor = Executors.newFixedThreadPool(3, object : ThreadFactory {
+            private val counter = AtomicInteger(0)
+            override fun newThread(r: Runnable): Thread {
+                return Thread(r, "Mirai Console Shutdown Daemon #" + counter.getAndIncrement()).also {
+                    it.isDaemon = true
+                }
+            }
+        })
+        executor.execute {
+            listen(crtThread, isConsoleRunning)
+            executor.shutdown()
+        }
+        GlobalScope.launch(executor.asCoroutineDispatcher()) {
+            bridge.coroutineContext.job.join()
+            isConsoleRunning.set(false)
+        }
+        bridge.mainLogger.debug { "SHUTDOWN DAEMON STARTED........." }
     }
 
     @Suppress("MemberVisibilityCanBePrivate")
@@ -217,10 +256,10 @@ internal object ShutdownDaemon {
         }
     }
 
-    private fun listen(thread: Thread) {
+    private fun listen(thread: Thread, consoleRunning: AtomicBoolean) {
         val startTime = System.currentTimeMillis()
         val timeout = 1000L * 60
-        while (thread.isAlive) {
+        while (consoleRunning.get()) {
             val crtTime = System.currentTimeMillis()
             if (crtTime - startTime >= timeout) {
                 kotlin.runCatching {