Enabling linuxArm64 builds

buildSrc/src/main/kotlin/IdeUtils.kt

@@ -8,6 +8,7 @@ import org.jetbrains.kotlin.konan.target.*
 
 fun KotlinMultiplatformExtension.ideaTarget(): KotlinNativeTarget = when (HostManager.host) {
     is KonanTarget.LINUX_X64 -> linuxX64()
+    is KonanTarget.LINUX_ARM64 -> linuxArm64()
     is KonanTarget.MACOS_X64 -> macosX64()
     is KonanTarget.MACOS_ARM64 -> macosArm64()
     is KonanTarget.MINGW_X64 -> mingwX64()

buildSrc/src/main/kotlin/NativeUtils.kt

@@ -16,7 +16,16 @@ fun Project.posixTargets(): List<String> = fastOr {
 }
 
 fun Project.nixTargets(): List<String> = fastOr {
-    darwinTargets() + kotlin.linuxX64().name
+    darwinTargets() + linuxTargets()
+}
+
+fun Project.linuxTargets(): List<String> = fastOr {
+    with(kotlin) {
+        listOf (
+            linuxX64(),
+            linuxArm64(),
+        )
+    }.map { it.name }
 }
 
 fun Project.darwinTargets(): List<String> = fastOr {
@@ -71,6 +80,7 @@ fun Project.desktopTargets(): List<String> = fastOr {
             macosX64(),
             macosArm64(),
             linuxX64(),
+            linuxArm64(),
             mingwX64()
         ).map { it.name }
     }

buildSrc/src/main/kotlin/Publication.kt

@@ -25,7 +25,7 @@ fun isAvailableForPublication(publication: Publication): Boolean {
         "kotlinMultiplatform"
     )
     result = result || name in jvmAndCommon
-    result = result || (HOST_NAME == "linux" && name == "linuxX64")
+    result = result || (HOST_NAME == "linux" && (name == "linuxX64" || name == "linuxArm64"))
     result = result || (HOST_NAME == "windows" && name == "mingwX64")
     val macPublications = setOf(
         "iosX64",

buildSrc/src/main/kotlin/TargetsConfig.kt

@@ -218,6 +218,7 @@ fun Project.configureTargets() {
 
             if (hasNative) {
                 tasks.findByName("linkDebugTestLinuxX64")?.onlyIf { HOST_NAME == "linux" }
+                tasks.findByName("linkDebugTestLinuxArm64")?.onlyIf { HOST_NAME == "linux" }
                 tasks.findByName("linkDebugTestMingwX64")?.onlyIf { HOST_NAME == "windows" }
             }
         }

gradle.properties

@@ -32,8 +32,8 @@ kotlin.native.binary.memoryModel=experimental
 #kotlinx.atomicfu.enableJsIrTransformation=true
 
 kotlin_version=1.8.10
-coroutines_version=1.6.4
-atomicfu_version=0.20.0
+coroutines_version=1.7.0-RC
+atomicfu_version=0.20.2
 slf4j_version=1.7.36
 junit_version=4.13.2
 logback_version=1.2.11

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
 kotlin-version = "1.8.10"
-kotlinx-html-version = "0.8.1"
-coroutines-version = "1.6.4"
-atomicfu-version = "0.18.5"
+kotlinx-html-version = "0.8.1-SNAPSHOT"
+coroutines-version = "1.7.0-RC"
+atomicfu-version = "0.20.2"
 serialization-version = "1.5.0"
 validator-version = "0.8.0"
 ktlint-version = "3.10.0"

ktor-client/ktor-client-curl/build.gradle.kts

@@ -32,7 +32,7 @@ kotlin {
         includeDirs.headerFilterOnly(paths)
     }
 
-    createCInterop("libcurl", listOf("macosArm64")) {
+    createCInterop("libcurl", listOf("macosArm64", "linuxArm64")) {
         defFile = File(projectDir, "desktop/interop/libcurl_arm64.def")
         includeDirs.headerFilterOnly(paths)
     }

ktor-network/jvm/src/io/ktor/network/sockets/DatagramSendChannel.kt

@@ -29,7 +29,7 @@ internal class DatagramSendChannel(
     private val closedCause = atomic<Throwable?>(null)
     private val lock = Mutex()
 
-    @ExperimentalCoroutinesApi
+    @DelicateCoroutinesApi
     override val isClosedForSend: Boolean
         get() = socket.isClosed
 

ktor-network/linuxArm64/src/io/ktor/network/selector/SelectUtilsLinux.kt

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package io.ktor.network.selector
+
+import kotlinx.cinterop.*
+import platform.linux.*
+import platform.posix.*
+
+internal actual fun pselectBridge(
+    descriptor: Int,
+    readSet: CPointer<fd_set>,
+    writeSet: CPointer<fd_set>,
+    errorSet: CPointer<fd_set>
+): Int = pselect(descriptor, readSet, writeSet, errorSet, null, null)
+
+internal actual fun inetNtopBridge(
+    type: Int,
+    address: CPointer<*>,
+    addressOf: CPointer<*>,
+    size: Int
+) {
+    @Suppress("UNCHECKED_CAST")
+    inet_ntop(type, address, addressOf as CPointer<ByteVarOf<Byte>>, size.convert())
+}

ktor-network/linuxArm64/src/io/ktor/network/util/SocketUtilsLinux.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package io.ktor.network.util
+
+import kotlinx.cinterop.*
+import platform.linux.*
+import platform.posix.*
+
+internal actual fun ktor_inet_ntop(
+    family: Int,
+    src: CValuesRef<*>?,
+    dst: CValuesRef<ByteVar>?,
+    size: socklen_t
+): CPointer<ByteVar>? = inet_ntop(family, src, dst, size)
+
+internal actual fun <T> unpack_sockaddr_un(
+    sockaddr: sockaddr,
+    block: (family: UShort, path: String) -> T
+): T {
+    val address = sockaddr.ptr.reinterpret<sockaddr_un>().pointed
+    return block(address.sun_family, address.sun_path.toKString())
+}
+
+internal actual fun pack_sockaddr_un(
+    family: UShort,
+    path: String,
+    block: (address: CPointer<sockaddr>, size: socklen_t) -> Unit
+) {
+    cValue<sockaddr_un> {
+        strcpy(sun_path, path)
+        sun_family = family
+
+        block(ptr.reinterpret(), sizeOf<sockaddr_un>().convert())
+    }
+}

ktor-network/linuxArm64/test/io/ktor/network/sockets/tests/TestUtilsLinux.kt

@@ -0,0 +1,7 @@
+/*
+ * Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package io.ktor.network.sockets.tests
+
+internal actual fun Any.supportsUnixDomainSockets(): Boolean = true

ktor-network/nix/src/io/ktor/network/sockets/DatagramSendChannel.kt

@@ -30,7 +30,7 @@ internal class DatagramSendChannel(
     private val closedCause = atomic<Throwable?>(null)
     private val lock = Mutex()
 
-    @ExperimentalCoroutinesApi
+    @DelicateCoroutinesApi
     override val isClosedForSend: Boolean
         get() = socket.isClosed
 

ktor-server/ktor-server-netty/jvm/src/io/ktor/server/netty/cio/RequestBodyHandler.kt

@@ -72,7 +72,7 @@ internal class RequestBodyHandler(
         }
     }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
+    @OptIn(DelicateCoroutinesApi::class)
     fun upgrade(): ByteReadChannel {
         val result = queue.trySend(Upgrade)
         if (result.isSuccess) return newChannel()
@@ -93,7 +93,7 @@ internal class RequestBodyHandler(
         return result
     }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
+    @OptIn(DelicateCoroutinesApi::class)
     private fun tryOfferChannelOrToken(token: Any) {
         val result = queue.trySend(token)
         if (result.isSuccess) return

ktor-shared/ktor-websockets/common/src/io/ktor/websocket/DefaultWebSocketSession.kt

@@ -155,7 +155,7 @@ internal class DefaultWebSocketSessionImpl(
         raw.cancel()
     }
 
-    @OptIn(InternalAPI::class)
+    @OptIn(InternalAPI::class, DelicateCoroutinesApi::class)
     private fun runIncomingProcessor(ponger: SendChannel<Frame.Ping>): Job = launch(
         IncomingProcessorCoroutineName + Dispatchers.Unconfined
     ) {

ktor-test-dispatcher/linuxArm64/src/TestLinuxArm64.kt

@@ -0,0 +1,20 @@
+package io.ktor.test.dispatcher
+
+import kotlinx.coroutines.*
+import platform.posix.*
+import kotlin.coroutines.*
+
+/**
+ * Test runner for native suspend tests.
+ */
+public actual fun testSuspend(
+    context: CoroutineContext,
+    timeoutMillis: Long,
+    block: suspend CoroutineScope.() -> Unit
+) {
+    executeInWorker(timeoutMillis) {
+        runBlocking {
+            block()
+        }
+    }
+}

ktor-utils/linuxArm64/src/io/ktor/util/ThreadInfoLinux.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014-2022 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package io.ktor.util
+
+import kotlinx.cinterop.*
+import platform.linux.*
+import platform.posix.*
+import threadUtils.*
+
+internal actual fun collectStack(thread: pthread_t): List<String> {
+    val size = collect_stack(thread)
+    if (size < 0) throw IllegalArgumentException("Thread is stopped")
+    val symbols = backtrace_symbols(callstack, size)!!
+    return List(stack_size) { symbols[it]!!.toKString() }
+}
+
+internal actual fun setSignalHandler() {
+    set_signal_handler()
+}

ktor-utils/posix/src/io/ktor/util/ThreadInfo.kt

@@ -22,7 +22,7 @@ public object ThreadInfo {
     }
 
     public fun registerCurrentThread() {
-        val thread = pthread_self()!!
+        val thread = pthread_self()
         threads[Worker.current] = thread
     }