Introduce concurrentMain sourceSet to exclude js and wasm from parking.

bbrockbernd · bbrockbernd · commit 22d9ca457769 · 2025-01-31T14:34:24.000+01:00
diff --git a/atomicfu/build.gradle.kts b/atomicfu/build.gradle.kts
@@ -93,6 +93,9 @@ kotlin {
                 implementation(libs.junit.junit)
             }
         }
+        
+        val concurrentMain by creating { dependsOn(commonMain.get()) }
+        val jvmMain by getting { dependsOn(concurrentMain) }
     }
 }
 
@@ -131,16 +134,20 @@ kotlin {
     applyDefaultHierarchyTemplate() 
 
     sourceSets {
-        val nativeUnixLikeMain by creating { dependsOn(nativeMain.get()) }
+        
+        val concurrentMain by getting {}
+        val nativeMain by getting { dependsOn(concurrentMain) }
+        
+        val nativeUnixLikeMain by creating { dependsOn(nativeMain) }
         
         
-        val androidNative64BitMain by creating { dependsOn(nativeMain.get()) }
+        val androidNative64BitMain by creating { dependsOn(nativeMain) }
         androidNative64BitMain.also {
             androidNativeArm64Main.get().dependsOn(it)
             androidNativeX64Main.get().dependsOn(it)
         }
 
-        val androidNative32BitMain by creating { dependsOn(nativeMain.get()) }
+        val androidNative32BitMain by creating { dependsOn(nativeMain) }
         androidNative32BitMain.let {
             androidNativeArm32Main.get().dependsOn(it)
             androidNativeX86Main.get().dependsOn(it)
diff --git a/atomicfu/src/androidNative32BitMain/kotlin/kotlinx/atomicfu/parking/PosixParkingDelegator.kt b/atomicfu/src/androidNative32BitMain/kotlin/kotlinx/atomicfu/parking/PosixParkingDelegator.kt
@@ -4,7 +4,6 @@ import kotlinx.atomicfu.AtomicBoolean
 import kotlinx.atomicfu.atomic
 import kotlinx.cinterop.*
 import kotlinx.cinterop.alloc
-import kotlinx.cinterop.free
 import kotlinx.cinterop.pointed
 import kotlinx.cinterop.ptr
 import platform.posix.*
diff --git a/atomicfu/src/androidNative64BitMain/kotlin/kotlinx/atomicfu/parking/PosixParkingDelegator.kt b/atomicfu/src/androidNative64BitMain/kotlin/kotlinx/atomicfu/parking/PosixParkingDelegator.kt
@@ -4,7 +4,6 @@ import kotlinx.atomicfu.AtomicBoolean
 import kotlinx.atomicfu.atomic
 import kotlinx.cinterop.*
 import kotlinx.cinterop.alloc
-import kotlinx.cinterop.free
 import kotlinx.cinterop.pointed
 import kotlinx.cinterop.ptr
 import platform.posix.*
diff --git a/atomicfu/src/apple32Main/kotlin/kotlinx/atomicfu/parking/PosixParkingDelegator.kt b/atomicfu/src/apple32Main/kotlin/kotlinx/atomicfu/parking/PosixParkingDelegator.kt
@@ -4,7 +4,6 @@ import kotlinx.atomicfu.AtomicBoolean
 import kotlinx.atomicfu.atomic
 import kotlinx.cinterop.*
 import kotlinx.cinterop.alloc
-import kotlinx.cinterop.free
 import kotlinx.cinterop.pointed
 import kotlinx.cinterop.ptr
 import platform.posix.*
diff --git a/atomicfu/src/apple64Main/kotlin/kotlinx/atomicfu/parking/PosixParkingDelegator.kt b/atomicfu/src/apple64Main/kotlin/kotlinx/atomicfu/parking/PosixParkingDelegator.kt
@@ -4,7 +4,6 @@ import kotlinx.atomicfu.AtomicBoolean
 import kotlinx.atomicfu.atomic
 import kotlinx.cinterop.*
 import kotlinx.cinterop.alloc
-import kotlinx.cinterop.free
 import kotlinx.cinterop.pointed
 import kotlinx.cinterop.ptr
 import platform.posix.*
diff --git a/atomicfu/src/concurrentMain/kotlin/kotlinx/atomicfu/parking/KThread.kt b/atomicfu/src/concurrentMain/kotlin/kotlinx/atomicfu/parking/KThread.kt
diff --git a/atomicfu/src/concurrentMain/kotlin/kotlinx/atomicfu/parking/ParkingDelegator.kt b/atomicfu/src/concurrentMain/kotlin/kotlinx/atomicfu/parking/ParkingDelegator.kt
diff --git a/atomicfu/src/concurrentMain/kotlin/kotlinx/atomicfu/parking/ThreadParker.kt b/atomicfu/src/concurrentMain/kotlin/kotlinx/atomicfu/parking/ThreadParker.kt
diff --git a/atomicfu/src/jsAndWasmSharedMain/kotlin/kotlinx/atomicfu/parking/KThread.kt b/atomicfu/src/jsAndWasmSharedMain/kotlin/kotlinx/atomicfu/parking/KThread.kt
diff --git a/atomicfu/src/jsAndWasmSharedMain/kotlin/kotlinx/atomicfu/parking/ParkingDelegator.kt b/atomicfu/src/jsAndWasmSharedMain/kotlin/kotlinx/atomicfu/parking/ParkingDelegator.kt
diff --git a/atomicfu/src/jvmTest/kotlin/kotlinx/atomicfu/test/parking/LatchTest.kt b/atomicfu/src/jvmTest/kotlin/kotlinx/atomicfu/test/parking/LatchTest.kt
@@ -5,7 +5,6 @@ import kotlinx.atomicfu.parking.Parker
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.atomic.AtomicIntegerArray
 import java.util.concurrent.atomic.AtomicReference
-import kotlin.concurrent.thread
 import kotlin.random.Random
 import kotlin.test.Test
 import kotlin.test.fail
diff --git a/atomicfu/src/jvmTest/kotlin/kotlinx/atomicfu/test/parking/ThreadParkingStressTest.kt b/atomicfu/src/jvmTest/kotlin/kotlinx/atomicfu/test/parking/ThreadParkingStressTest.kt
@@ -91,9 +91,9 @@ class ThreadParkingStressTest {
                 while (!done0.get() || !done1.get()) {
                     sleep(Random.nextLong(0, 5))
                     if (Random.nextBoolean()) {
-                        kthread0.get()?.let {Parker.unpark(it)}
+                        kthread0.get()?.let { Parker.unpark(it)}
                     } else {
-                        kthread1.get()?.let {Parker.unpark(it)}
+                        kthread1.get()?.let { Parker.unpark(it)}
                     }
                 }
             }
@@ -102,9 +102,9 @@ class ThreadParkingStressTest {
                 while (!done0.get() || !done1.get()) {
                     sleep(Random.nextLong(0, 5))
                     if (Random.nextBoolean()) {
-                        kthread0.get()?.let {Parker.unpark(it)}
+                        kthread0.get()?.let { Parker.unpark(it)}
                     } else {
-                        kthread1.get()?.let {Parker.unpark(it)}
+                        kthread1.get()?.let { Parker.unpark(it)}
                     }
                 }
             }
diff --git a/atomicfu/src/linux32Main/kotlin/kotlinx/atomicfu/parking/PosixParkingDelegator.kt b/atomicfu/src/linux32Main/kotlin/kotlinx/atomicfu/parking/PosixParkingDelegator.kt
@@ -4,7 +4,6 @@ import kotlinx.atomicfu.AtomicBoolean
 import kotlinx.atomicfu.atomic
 import kotlinx.cinterop.*
 import kotlinx.cinterop.alloc
-import kotlinx.cinterop.free
 import kotlinx.cinterop.pointed
 import kotlinx.cinterop.ptr
 import platform.posix.*
diff --git a/atomicfu/src/mingwMain/kotlin/kotlinx/atomicfu/parking/PosixParkingDelegator.kt b/atomicfu/src/mingwMain/kotlin/kotlinx/atomicfu/parking/PosixParkingDelegator.kt
@@ -4,7 +4,6 @@ import kotlinx.atomicfu.AtomicBoolean
 import kotlinx.atomicfu.atomic
 import kotlinx.cinterop.*
 import kotlinx.cinterop.alloc
-import kotlinx.cinterop.free
 import kotlinx.cinterop.pointed
 import kotlinx.cinterop.ptr
 import platform.posix.*
diff --git a/atomicfu/src/nativeTest/kotlin/kotlinx/atomicfu/parking/ThreadParkingStressTest.kt b/atomicfu/src/nativeTest/kotlin/kotlinx/atomicfu/parking/ThreadParkingStressTest.kt
@@ -99,9 +99,9 @@ class ThreadParkingStressTest {
                 while (!ppt.done0.value || !ppt.done1.value) {
                     usleep(Random.nextUInt(0u, 500u))
                     if (Random.nextBoolean()) {
-                        ppt.thread0.value?.let {Parker.unpark(it)}
+                        ppt.thread0.value?.let { Parker.unpark(it)}
                     } else {
-                        ppt.thread1.value?.let {Parker.unpark(it)}
+                        ppt.thread1.value?.let { Parker.unpark(it)}
                     }
                 }
             }
@@ -110,9 +110,9 @@ class ThreadParkingStressTest {
                 while (!ppt.done0.value || !ppt.done1.value) {
                     usleep(Random.nextUInt(0u, 500u))
                     if (Random.nextBoolean()) {
-                        ppt.thread0.value?.let {Parker.unpark(it)}
+                        ppt.thread0.value?.let { Parker.unpark(it)}
                     } else {
-                        ppt.thread1.value?.let {Parker.unpark(it)}
+                        ppt.thread1.value?.let { Parker.unpark(it)}
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,9 @@ kotlin {`
`93`	`93`	`implementation(libs.junit.junit)`
`94`	`94`	`}`
`95`	`95`	`}`
	`96`	`+`
	`97`	`+ val concurrentMain by creating { dependsOn(commonMain.get()) }`
	`98`	`+ val jvmMain by getting { dependsOn(concurrentMain) }`
`96`	`99`	`}`
`97`	`100`	`}`
`98`	`101`
`@@ -131,16 +134,20 @@ kotlin {`
`131`	`134`	`applyDefaultHierarchyTemplate()`
`132`	`135`
`133`	`136`	`sourceSets {`
`134`		`- val nativeUnixLikeMain by creating { dependsOn(nativeMain.get()) }`
	`137`	`+`
	`138`	`+ val concurrentMain by getting {}`
	`139`	`+ val nativeMain by getting { dependsOn(concurrentMain) }`
	`140`	`+`
	`141`	`+ val nativeUnixLikeMain by creating { dependsOn(nativeMain) }`
`135`	`142`
`136`	`143`
`137`		`- val androidNative64BitMain by creating { dependsOn(nativeMain.get()) }`
	`144`	`+ val androidNative64BitMain by creating { dependsOn(nativeMain) }`
`138`	`145`	`androidNative64BitMain.also {`
`139`	`146`	`androidNativeArm64Main.get().dependsOn(it)`
`140`	`147`	`androidNativeX64Main.get().dependsOn(it)`
`141`	`148`	`}`
`142`	`149`
`143`		`- val androidNative32BitMain by creating { dependsOn(nativeMain.get()) }`
	`150`	`+ val androidNative32BitMain by creating { dependsOn(nativeMain) }`
`144`	`151`	`androidNative32BitMain.let {`
`145`	`152`	`androidNativeArm32Main.get().dependsOn(it)`
`146`	`153`	`androidNativeX86Main.get().dependsOn(it)`
Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,9 @@ class ThreadParkingStressTest {`
`91`	`91`	`while (!done0.get() \|\| !done1.get()) {`
`92`	`92`	`sleep(Random.nextLong(0, 5))`
`93`	`93`	`if (Random.nextBoolean()) {`
`94`		`- kthread0.get()?.let {Parker.unpark(it)}`
	`94`	`+ kthread0.get()?.let { Parker.unpark(it)}`
`95`	`95`	`} else {`
`96`		`- kthread1.get()?.let {Parker.unpark(it)}`
	`96`	`+ kthread1.get()?.let { Parker.unpark(it)}`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`}`
`@@ -102,9 +102,9 @@ class ThreadParkingStressTest {`
`102`	`102`	`while (!done0.get() \|\| !done1.get()) {`
`103`	`103`	`sleep(Random.nextLong(0, 5))`
`104`	`104`	`if (Random.nextBoolean()) {`
`105`		`- kthread0.get()?.let {Parker.unpark(it)}`
	`105`	`+ kthread0.get()?.let { Parker.unpark(it)}`
`106`	`106`	`} else {`
`107`		`- kthread1.get()?.let {Parker.unpark(it)}`
	`107`	`+ kthread1.get()?.let { Parker.unpark(it)}`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,9 @@ class ThreadParkingStressTest {`
`99`	`99`	`while (!ppt.done0.value \|\| !ppt.done1.value) {`
`100`	`100`	`usleep(Random.nextUInt(0u, 500u))`
`101`	`101`	`if (Random.nextBoolean()) {`
`102`		`- ppt.thread0.value?.let {Parker.unpark(it)}`
	`102`	`+ ppt.thread0.value?.let { Parker.unpark(it)}`
`103`	`103`	`} else {`
`104`		`- ppt.thread1.value?.let {Parker.unpark(it)}`
	`104`	`+ ppt.thread1.value?.let { Parker.unpark(it)}`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`	`}`
`@@ -110,9 +110,9 @@ class ThreadParkingStressTest {`
`110`	`110`	`while (!ppt.done0.value \|\| !ppt.done1.value) {`
`111`	`111`	`usleep(Random.nextUInt(0u, 500u))`
`112`	`112`	`if (Random.nextBoolean()) {`
`113`		`- ppt.thread0.value?.let {Parker.unpark(it)}`
	`113`	`+ ppt.thread0.value?.let { Parker.unpark(it)}`
`114`	`114`	`} else {`
`115`		`- ppt.thread1.value?.let {Parker.unpark(it)}`
	`115`	`+ ppt.thread1.value?.let { Parker.unpark(it)}`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`	`}`