KTOR-3422 Upgrade kotlin to 1.6.0 (#2693)

ktorio · Nov 25, 2021 · e8531a1 · e8531a1
1 parent 5510f8e
commit e8531a1
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 46 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -19,14 +19,14 @@ org.gradle.vfs.watch=true
 org.gradle.jvmargs=-Xmx6g -XX:MaxPermSize=6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # kotlin
-kotlin_version=1.5.31
+kotlin_version=1.6.0
 kotlin.native.ignoreDisabledTargets=true
 kotlin.mpp.stability.nowarn=true
 
 # kotlin libraries
 serialization_version=1.3.0
 coroutines_version=1.5.2-native-mt
-atomicfu_version=0.16.3
+atomicfu_version=0.17.0
 validator_version=0.3.0
 kotlinx_html_version=0.7.3
 

diff --git a/ktor-http/ktor-http-cio/js/src/io/ktor/http/cio/websocket/WebSocketSessionJs.kt b/ktor-http/ktor-http-cio/js/src/io/ktor/http/cio/websocket/WebSocketSessionJs.kt
@@ -36,7 +36,7 @@ public actual interface WebSocketSession : CoroutineScope {
      * raw websocket session.
      */
     @Suppress("ACTUAL_WITHOUT_EXPECT")
-    public suspend fun send(frame: Frame) {
+    public actual suspend fun send(frame: Frame) {
         outgoing.send(frame)
     }
 

diff --git a/ktor-http/ktor-http-cio/jvm/src/io/ktor/http/cio/websocket/WebSocketSessionJvm.kt b/ktor-http/ktor-http-cio/jvm/src/io/ktor/http/cio/websocket/WebSocketSessionJvm.kt
@@ -48,7 +48,7 @@ public actual interface WebSocketSession : CoroutineScope {
      * raw websocket session.
      */
     @Suppress("ACTUAL_WITHOUT_EXPECT")
-    public suspend fun send(frame: Frame) {
+    public actual suspend fun send(frame: Frame) {
         outgoing.send(frame)
     }
 

diff --git a/ktor-http/ktor-http-cio/posix/src/io/ktor/http/cio/websocket/WebSocketSessionNative.kt b/ktor-http/ktor-http-cio/posix/src/io/ktor/http/cio/websocket/WebSocketSessionNative.kt
@@ -31,7 +31,7 @@ public actual interface WebSocketSession : CoroutineScope {
      * raw websocket session.
      */
     @Suppress("ACTUAL_WITHOUT_EXPECT")
-    public suspend fun send(frame: Frame) {
+    public actual suspend fun send(frame: Frame) {
         outgoing.send(frame)
     }
 

diff --git a/ktor-io/common/src/io/ktor/utils/io/core/internal/Unsafe.kt b/ktor-io/common/src/io/ktor/utils/io/core/internal/Unsafe.kt
@@ -16,19 +16,6 @@ import kotlin.native.concurrent.*
 @Experimental(level = Experimental.Level.ERROR)
 public annotation class DangerousInternalIoApi
 
-@DangerousInternalIoApi
-public fun ByteReadPacket.`$unsafeAppend$`(builder: BytePacketBuilder) {
-    val builderHead = builder.stealAll() ?: return
-    val builderSize = builder.size
-
-    if (builderSize <= PACKET_MAX_COPY_SIZE && builderHead.next == null && tryWriteAppend(builderHead)) {
-        builder.afterBytesStolen()
-        return
-    }
-
-    append(builderHead)
-}
-
 internal fun ByteReadPacket.unsafeAppend(builder: BytePacketBuilder): Int {
     val builderSize = builder.size
     val builderHead = builder.stealAll() ?: return 0

diff --git a/ktor-io/jvm/src/io/ktor/utils/io/ByteBufferChannel.kt b/ktor-io/jvm/src/io/ktor/utils/io/ByteBufferChannel.kt
@@ -2362,25 +2362,29 @@ internal open class ByteBufferChannel(
     private suspend fun writeSuspend(size: Int) {
         while (writeSuspendPredicate(size)) {
             suspendCancellableCoroutine<Unit> { c ->
-                do {
-                    closed?.sendException?.let { rethrowClosed(it) }
-                    if (!writeSuspendPredicate(size)) {
-                        c.resume(Unit)
-                        break
-                    }
-                } while (!setContinuation({ writeOp }, _writeOp, c, { writeSuspendPredicate(size) }))
-
-                flushImpl(minWriteSize = size)
-
-                if (shouldResumeReadOp()) {
-                    resumeReadOp()
-                }
+                writeSuspend(size, c)
             }
         }
 
         closed?.sendException?.let { rethrowClosed(it) }
     }
 
+    private fun writeSuspend(size: Int, c: CancellableContinuation<Unit>) {
+        do {
+            closed?.sendException?.let { rethrowClosed(it) }
+            if (!writeSuspendPredicate(size)) {
+                c.resume(Unit)
+                break
+            }
+        } while (!setContinuation({ writeOp }, _writeOp, c, { writeSuspendPredicate(size) }))
+
+        flushImpl(minWriteSize = size)
+
+        if (shouldResumeReadOp()) {
+            resumeReadOp()
+        }
+    }
+
     private inline fun <T, C : Continuation<T>> setContinuation(
         getter: () -> C?,
         updater: AtomicRef<C?>,

diff --git a/ktor-io/jvm/src/io/ktor/utils/io/jvm/javaio/Blocking.kt b/ktor-io/jvm/src/io/ktor/utils/io/jvm/javaio/Blocking.kt
@@ -262,25 +262,29 @@ private abstract class BlockingAdapter(val parent: Job? = null) {
         result.value = rc
 
         return suspendCoroutineUninterceptedOrReturn { ucont ->
-            var thread: Thread? = null
-
-            state.update { value ->
-                when (value) {
-                    is Thread -> {
-                        thread = value
-                        ucont.intercepted()
-                    }
-                    this -> ucont.intercepted()
-                    else -> throw IllegalStateException("Already suspended or in finished state")
-                }
-            }
+            rendezvous(ucont)
+        }
+    }
+
+    private fun rendezvous(ucont: Continuation<Any>): Any {
+        var thread: Thread? = null
 
-            if (thread != null) {
-                parkingImpl.unpark(thread!!)
+        state.update { value ->
+            when (value) {
+                is Thread -> {
+                    thread = value
+                    ucont.intercepted()
+                }
+                this -> ucont.intercepted()
+                else -> throw IllegalStateException("Already suspended or in finished state")
             }
+        }
 
-            COROUTINE_SUSPENDED
+        if (thread != null) {
+            parkingImpl.unpark(thread!!)
         }
+
+        return COROUTINE_SUSPENDED
     }
 
     protected fun finish(rc: Int) {