Get rid of GlobalScope

strangepleasures · Sep 6, 2021 · 948e92e · 948e92e
1 parent 42dce7a
commit 948e92e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/main/kotlin/org/jetbrains/kotlinx/jupyter/connection.kt b/src/main/kotlin/org/jetbrains/kotlinx/jupyter/connection.kt
@@ -1,5 +1,8 @@
 package org.jetbrains.kotlinx.jupyter
 
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -147,6 +150,7 @@ class JupyterConnection(val config: KernelConfig) : Closeable {
     var contextMessage: Message? = null
 
     private val currentExecutions = HashSet<Thread>()
+    private val coroutineScope = CoroutineScope(Dispatchers.Default)
 
     data class ConnectionExecutionResult<T>(
         val result: T?,
@@ -189,6 +193,10 @@ class JupyterConnection(val config: KernelConfig) : Closeable {
         }
     }
 
+    fun launchJob(runnable: suspend CoroutineScope.() -> Unit) {
+        coroutineScope.launch(block = runnable)
+    }
+
     override fun close() {
         heartbeat.close()
         shell.close()

diff --git a/src/main/kotlin/org/jetbrains/kotlinx/jupyter/protocol.kt b/src/main/kotlin/org/jetbrains/kotlinx/jupyter/protocol.kt
@@ -1,9 +1,6 @@
 package org.jetbrains.kotlinx.jupyter
 
 import ch.qos.logback.classic.Level
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.encodeToJsonElement
@@ -300,14 +297,14 @@ fun JupyterConnection.Socket.shellMessagesHandler(msg: Message, repl: ReplForJup
             sendWrapped(msg, makeReplyMessage(msg, MessageType.COMM_INFO_REPLY, content = CommInfoReply(mapOf())))
         }
         is CompleteRequest -> {
-            GlobalScope.launch(Dispatchers.Default) {
+            connection.launchJob {
                 repl.complete(content.code, content.cursorPos) { result ->
                     sendWrapped(msg, makeReplyMessage(msg, MessageType.COMPLETE_REPLY, content = result.message))
                 }
             }
         }
         is ListErrorsRequest -> {
-            GlobalScope.launch(Dispatchers.Default) {
+            connection.launchJob {
                 repl.listErrors(content.code) { result ->
                     sendWrapped(msg, makeReplyMessage(msg, MessageType.LIST_ERRORS_REPLY, content = result.message))
                 }