Skip to content

Commit 0d9ea07

Browse files
committed
Fix after rebase
1 parent c7df10f commit 0d9ea07

File tree

5 files changed

+17
-58
lines changed

5 files changed

+17
-58
lines changed

atomicfu/src/androidNative64BitMain/kotlin/kotlinx/atomicfu/locks/NativeMutexNode.kt

Lines changed: 0 additions & 50 deletions
This file was deleted.

atomicfu/src/androidNativeMain/kotlin/kotlinx/atomicfu/locks/NativeMutexNode.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
*/
44
package kotlinx.atomicfu.locks
55

6+
import kotlinx.atomicfu.atomic
67
import kotlinx.cinterop.Arena
78
import kotlinx.cinterop.ExperimentalForeignApi
9+
import kotlinx.cinterop.UnsafeNumber
810
import kotlinx.cinterop.alloc
911
import kotlinx.cinterop.ptr
1012
import platform.posix.*
1113

12-
@OptIn(ExperimentalForeignApi::class)
14+
@OptIn(ExperimentalForeignApi::class, UnsafeNumber::class)
1315
actual class NativeMutexNode {
1416
actual var next: NativeMutexNode? = null
1517

@@ -49,3 +51,7 @@ actual class NativeMutexNode {
4951
arena.clear()
5052
}
5153
}
54+
55+
private val threadCounter = atomic(0L)
56+
57+
actual fun createThreadId(): Long = threadCounter.incrementAndGet()

atomicfu/src/nativeUnixLikeMain/kotlin/kotlinx/atomicfu/locks/NativeMutexNode.kt renamed to atomicfu/src/linuxMain/kotlin/kotlinx/atomicfu/locks/NativeMutexNode.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
package kotlinx.atomicfu.locks
55

6+
import kotlinx.atomicfu.atomic
67
import kotlinx.cinterop.Arena
78
import kotlinx.cinterop.ExperimentalForeignApi
89
import kotlinx.cinterop.alloc
@@ -48,3 +49,7 @@ actual class NativeMutexNode {
4849
arena.clear()
4950
}
5051
}
52+
53+
private val threadCounter = atomic(0L)
54+
55+
internal actual fun createThreadId(): Long = threadCounter.incrementAndGet()

atomicfu/src/mingwMain/kotlin/kotlinx/atomicfu/locks/NativeMutexNode.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
package kotlinx.atomicfu.locks
55

6+
import kotlinx.atomicfu.atomic
67
import kotlinx.cinterop.Arena
78
import kotlinx.cinterop.ExperimentalForeignApi
89
import kotlinx.cinterop.alloc
@@ -48,3 +49,7 @@ actual class NativeMutexNode {
4849
arena.clear()
4950
}
5051
}
52+
53+
private val threadCounter = atomic(0L)
54+
55+
actual fun createThreadId(): Long = threadCounter.incrementAndGet()

atomicfu/src/nativeNonAppleMain/kotlin/kotlinx/atomicfu/locks/ThreadId.kt

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)