Use new kotlin.concurrent.atomics

Author: serras

arrow-libs/core/arrow-atomic/src/androidAndJvmMain/kotlin/arrow/atomic/Atomic.kt

@@ -1,7 +1,9 @@
-@file:OptIn(ExperimentalContracts::class)
+@file:OptIn(ExperimentalContracts::class, ExperimentalAtomicApi::class)
 
 package arrow.atomic
 
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
+import kotlin.concurrent.atomics.AtomicReference as KtAtomicReference
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
@@ -29,16 +31,18 @@ import kotlin.contracts.contract
  *
  * **WARNING**: Use [AtomicInt] and [AtomicLong] for [Int] and [Long] on Kotlin Native!
  */
-public expect class Atomic<V>(initialValue: V) {
-  public fun get(): V
-  public fun set(value: V)
-  public fun getAndSet(value: V): V
+public class Atomic<V>(initialValue: V) {
+  private val inner = KtAtomicReference(initialValue)
+
+  public fun get(): V = inner.load()
+  public fun set(value: V) { inner.store(value) }
+  public fun getAndSet(value: V): V = inner.exchange(value)
 
   /**
    * Compare current value with expected and set to new if they're the same. Note, 'compare' is checking
    * the actual object id, not 'equals'.
    */
-  public fun compareAndSet(expected: V, new: V): Boolean
+  public fun compareAndSet(expected: V, new: V): Boolean = inner.compareAndSet(expected, new)
 }
 
 public var <T> Atomic<T>.value: T

arrow-libs/core/arrow-atomic/src/androidAndJvmMain/kotlin/arrow/atomic/AtomicInt.kt

@@ -1,33 +1,32 @@
-@file:OptIn(ExperimentalContracts::class)
+@file:OptIn(ExperimentalContracts::class, ExperimentalAtomicApi::class)
 
 package arrow.atomic
 
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
+import kotlin.concurrent.atomics.AtomicBoolean as KtAtomicBoolean
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 
 public class AtomicBoolean(value: Boolean) {
-  private val inner = AtomicInt(value.toInt())
+  private val inner = KtAtomicBoolean(value)
 
   public var value: Boolean
-    get() = inner.value != 0
+    get() = inner.load()
     set(value) {
-      inner.value = value.toInt()
+      inner.store(value)
     }
 
   public fun compareAndSet(expected: Boolean, new: Boolean): Boolean =
-    inner.compareAndSet(expected.toInt(), new.toInt())
+    inner.compareAndSet(expected, new)
 
   public fun get(): Boolean = value
   public fun set(value: Boolean) {
      this.value = value
   }
 
   public fun getAndSet(value: Boolean): Boolean =
-    inner.getAndSet(value.toInt()) == 1
-
-  private fun Boolean.toInt(): Int =
-    if (this) 1 else 0
+    inner.exchange(value)
 }
 
 

arrow-libs/core/arrow-atomic/src/androidAndJvmMain/kotlin/arrow/atomic/AtomicLong.kt

@@ -1,23 +1,28 @@
-@file:OptIn(ExperimentalContracts::class)
+@file:OptIn(ExperimentalContracts::class, ExperimentalAtomicApi::class)
 
 package arrow.atomic
 
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
+import kotlin.concurrent.atomics.decrementAndFetch
+import kotlin.concurrent.atomics.incrementAndFetch
+import kotlin.concurrent.atomics.AtomicInt as KtAtomicInt
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 
-public expect class AtomicInt(initialValue: Int) {
+public class AtomicInt(initialValue: Int) {
+  private val inner = KtAtomicInt(initialValue)
 
-  public fun get(): Int
-  public fun set(newValue: Int)
-  public fun getAndSet(value: Int): Int
+  public fun get(): Int = inner.load()
+  public fun set(newValue: Int) { inner.store(newValue) }
+  public fun getAndSet(value: Int): Int = inner.exchange(value)
 
-  public fun incrementAndGet(): Int
-  public fun decrementAndGet(): Int
+  public fun incrementAndGet(): Int = inner.incrementAndFetch()
+  public fun decrementAndGet(): Int = inner.decrementAndFetch()
 
-  public fun addAndGet(delta: Int): Int
+  public fun addAndGet(delta: Int): Int = inner.addAndFetch(delta)
 
-  public fun compareAndSet(expected: Int, new: Int): Boolean
+  public fun compareAndSet(expected: Int, new: Int): Boolean = inner.compareAndSet(expected, new)
 }
 
 public var AtomicInt.value: Int

arrow-libs/core/arrow-atomic/src/commonMain/kotlin/arrow/atomic/Atomic.kt

@@ -1,23 +1,28 @@
-@file:OptIn(ExperimentalContracts::class)
+@file:OptIn(ExperimentalContracts::class, ExperimentalAtomicApi::class)
 
 package arrow.atomic
 
+import kotlin.concurrent.atomics.AtomicLong as KtAtomicLong
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
+import kotlin.concurrent.atomics.decrementAndFetch
+import kotlin.concurrent.atomics.incrementAndFetch
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 
-public expect class AtomicLong(initialValue: Long) {
+public class AtomicLong(initialValue: Long) {
+  private val inner = KtAtomicLong(initialValue)
 
-  public fun get(): Long
-  public fun set(newValue: Long)
-  public fun getAndSet(value: Long): Long
+  public fun get(): Long = inner.load()
+  public fun set(newValue: Long) { inner.store(newValue) }
+  public fun getAndSet(value: Long): Long = inner.exchange(value)
 
-  public fun incrementAndGet(): Long
-  public fun decrementAndGet(): Long
+  public fun incrementAndGet(): Long = inner.incrementAndFetch()
+  public fun decrementAndGet(): Long = inner.decrementAndFetch()
 
-  public fun addAndGet(delta: Long): Long
+  public fun addAndGet(delta: Long): Long = inner.addAndFetch(delta)
 
-  public fun compareAndSet(expected: Long, new: Long): Boolean
+  public fun compareAndSet(expected: Long, new: Long): Boolean = inner.compareAndSet(expected, new)
 }
 
 public var AtomicLong.value: Long