Atomic value setters. (#1902)
This commit is contained in:
@@ -78,6 +78,26 @@ fun test4() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun test5() {
|
||||||
|
assertFailsWith<InvalidMutabilityException> {
|
||||||
|
AtomicReference<Data>().set(Data(2))
|
||||||
|
}
|
||||||
|
val ref = AtomicReference<Data>()
|
||||||
|
val value = Data(3).freeze()
|
||||||
|
assertEquals(null, ref.get())
|
||||||
|
ref.set(value)
|
||||||
|
assertEquals(3, ref.get()!!.value)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun test6() {
|
||||||
|
val int = AtomicInt()
|
||||||
|
int.set(239)
|
||||||
|
assertEquals(239, int.get())
|
||||||
|
val long = AtomicLong()
|
||||||
|
long.set(239L)
|
||||||
|
assertEquals(239L, long.get())
|
||||||
|
}
|
||||||
|
|
||||||
@Test fun runTest() {
|
@Test fun runTest() {
|
||||||
val COUNT = 20
|
val COUNT = 20
|
||||||
val workers = Array(COUNT, { _ -> startWorker()})
|
val workers = Array(COUNT, { _ -> startWorker()})
|
||||||
@@ -86,6 +106,8 @@ fun test4() {
|
|||||||
test2(workers)
|
test2(workers)
|
||||||
test3(workers)
|
test3(workers)
|
||||||
test4()
|
test4()
|
||||||
|
test5()
|
||||||
|
test6()
|
||||||
|
|
||||||
workers.forEach {
|
workers.forEach {
|
||||||
it.requestTermination().consume { _ -> }
|
it.requestTermination().consume { _ -> }
|
||||||
|
|||||||
@@ -27,6 +27,11 @@ struct AtomicReferenceLayout {
|
|||||||
KInt lock_;
|
KInt lock_;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
template <typename T> void setImpl(KRef thiz, T value) {
|
||||||
|
volatile T* location = reinterpret_cast<volatile T*>(thiz + 1);
|
||||||
|
atomicSet(location, value);
|
||||||
|
}
|
||||||
|
|
||||||
template <typename T> T addAndGetImpl(KRef thiz, T delta) {
|
template <typename T> T addAndGetImpl(KRef thiz, T delta) {
|
||||||
volatile T* location = reinterpret_cast<volatile T*>(thiz + 1);
|
volatile T* location = reinterpret_cast<volatile T*>(thiz + 1);
|
||||||
return atomicAdd(location, delta);
|
return atomicAdd(location, delta);
|
||||||
@@ -53,6 +58,10 @@ KInt Kotlin_AtomicInt_compareAndSwap(KRef thiz, KInt expectedValue, KInt newValu
|
|||||||
return compareAndSwapImpl(thiz, expectedValue, newValue);
|
return compareAndSwapImpl(thiz, expectedValue, newValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Kotlin_AtomicInt_set(KRef thiz, KInt newValue) {
|
||||||
|
setImpl(thiz, newValue);
|
||||||
|
}
|
||||||
|
|
||||||
KLong Kotlin_AtomicLong_addAndGet(KRef thiz, KLong delta) {
|
KLong Kotlin_AtomicLong_addAndGet(KRef thiz, KLong delta) {
|
||||||
return addAndGetImpl(thiz, delta);
|
return addAndGetImpl(thiz, delta);
|
||||||
}
|
}
|
||||||
@@ -75,10 +84,28 @@ KLong Kotlin_AtomicLong_compareAndSwap(KRef thiz, KLong expectedValue, KLong new
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Kotlin_AtomicLong_set(KRef thiz, KLong newValue) {
|
||||||
|
#ifdef __mips
|
||||||
|
// Potentially huge performance penalty, but correct.
|
||||||
|
// TODO: reconsider, once target MIPS can do proper 64-bit atomic store.
|
||||||
|
static int lock = 0;
|
||||||
|
while (compareAndSwap(&lock, 0, 1) != 0);
|
||||||
|
KLong* address = reinterpret_cast<KLong*>(thiz + 1);
|
||||||
|
*address = newValue;
|
||||||
|
compareAndSwap(&lock, 1, 0);
|
||||||
|
#else
|
||||||
|
setImpl(thiz, newValue);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
KNativePtr Kotlin_AtomicNativePtr_compareAndSwap(KRef thiz, KNativePtr expectedValue, KNativePtr newValue) {
|
KNativePtr Kotlin_AtomicNativePtr_compareAndSwap(KRef thiz, KNativePtr expectedValue, KNativePtr newValue) {
|
||||||
return compareAndSwapImpl(thiz, expectedValue, newValue);
|
return compareAndSwapImpl(thiz, expectedValue, newValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Kotlin_AtomicNativePtr_set(KRef thiz, KNativePtr newValue) {
|
||||||
|
setImpl(thiz, newValue);
|
||||||
|
}
|
||||||
|
|
||||||
void Kotlin_AtomicReference_checkIfFrozen(KRef value) {
|
void Kotlin_AtomicReference_checkIfFrozen(KRef value) {
|
||||||
if (value != nullptr && !value->container()->permanentOrFrozen()) {
|
if (value != nullptr && !value->container()->permanentOrFrozen()) {
|
||||||
ThrowInvalidMutabilityException(value);
|
ThrowInvalidMutabilityException(value);
|
||||||
@@ -92,6 +119,12 @@ OBJ_GETTER(Kotlin_AtomicReference_compareAndSwap, KRef thiz, KRef expectedValue,
|
|||||||
RETURN_RESULT_OF(SwapRefLocked, &ref->value_, expectedValue, newValue, &ref->lock_);
|
RETURN_RESULT_OF(SwapRefLocked, &ref->value_, expectedValue, newValue, &ref->lock_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Kotlin_AtomicReference_set(KRef thiz, KRef newValue) {
|
||||||
|
Kotlin_AtomicReference_checkIfFrozen(newValue);
|
||||||
|
AtomicReferenceLayout* ref = asAtomicReference(thiz);
|
||||||
|
SetRefLocked(&ref->value_, newValue, &ref->lock_);
|
||||||
|
}
|
||||||
|
|
||||||
OBJ_GETTER(Kotlin_AtomicReference_get, KRef thiz) {
|
OBJ_GETTER(Kotlin_AtomicReference_get, KRef thiz) {
|
||||||
// Here we must take a lock to prevent race when value, while taken here, is CASed and immediately
|
// Here we must take a lock to prevent race when value, while taken here, is CASed and immediately
|
||||||
// destroyed by an another thread. AtomicReference no longer holds such an object, so if we got
|
// destroyed by an another thread. AtomicReference no longer holds such an object, so if we got
|
||||||
|
|||||||
@@ -25,5 +25,13 @@ ALWAYS_INLINE inline T compareAndSwap(volatile T* where, T expectedValue, T newV
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
ALWAYS_INLINE inline void atomicSet(volatile T* where, T what) {
|
||||||
|
#ifndef KONAN_NO_THREADS
|
||||||
|
__atomic_store(where, &what, __ATOMIC_SEQ_CST);
|
||||||
|
#else
|
||||||
|
*where = what;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
#endif // RUNTIME_ATOMIC_H
|
#endif // RUNTIME_ATOMIC_H
|
||||||
@@ -1743,6 +1743,16 @@ OBJ_GETTER(SwapRefLocked,
|
|||||||
return oldValue;
|
return oldValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SetRefLocked(ObjHeader** location, ObjHeader* newValue, int32_t* spinlock) {
|
||||||
|
lock(spinlock);
|
||||||
|
ObjHeader* oldValue = *location;
|
||||||
|
// We do not use UpdateRef() here to avoid having ReleaseRef() on old value under the lock.
|
||||||
|
SetRef(location, newValue);
|
||||||
|
unlock(spinlock);
|
||||||
|
if (oldValue != nullptr)
|
||||||
|
ReleaseRef(oldValue);
|
||||||
|
}
|
||||||
|
|
||||||
OBJ_GETTER(ReadRefLocked, ObjHeader** location, int32_t* spinlock) {
|
OBJ_GETTER(ReadRefLocked, ObjHeader** location, int32_t* spinlock) {
|
||||||
lock(spinlock);
|
lock(spinlock);
|
||||||
ObjHeader* value = *location;
|
ObjHeader* value = *location;
|
||||||
|
|||||||
@@ -443,6 +443,8 @@ void UpdateReturnRef(ObjHeader** returnSlot, const ObjHeader* object) RUNTIME_NO
|
|||||||
// Compares and swaps reference with taken lock.
|
// Compares and swaps reference with taken lock.
|
||||||
OBJ_GETTER(SwapRefLocked,
|
OBJ_GETTER(SwapRefLocked,
|
||||||
ObjHeader** location, ObjHeader* expectedValue, ObjHeader* newValue, int32_t* spinlock) RUNTIME_NOTHROW;
|
ObjHeader** location, ObjHeader* expectedValue, ObjHeader* newValue, int32_t* spinlock) RUNTIME_NOTHROW;
|
||||||
|
// Sets reference with taken lock.
|
||||||
|
void SetRefLocked(ObjHeader** location, ObjHeader* newValue, int32_t* spinlock) RUNTIME_NOTHROW;
|
||||||
// Reads reference with taken lock.
|
// Reads reference with taken lock.
|
||||||
OBJ_GETTER(ReadRefLocked, ObjHeader** location, int32_t* spinlock) RUNTIME_NOTHROW;
|
OBJ_GETTER(ReadRefLocked, ObjHeader** location, int32_t* spinlock) RUNTIME_NOTHROW;
|
||||||
// Optimization: release all references in range.
|
// Optimization: release all references in range.
|
||||||
|
|||||||
@@ -37,6 +37,12 @@ class AtomicInt(private var value: Int = 0) {
|
|||||||
@SymbolName("Kotlin_AtomicInt_compareAndSwap")
|
@SymbolName("Kotlin_AtomicInt_compareAndSwap")
|
||||||
external fun compareAndSwap(expected: Int, new: Int): Int
|
external fun compareAndSwap(expected: Int, new: Int): Int
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the new atomic value.
|
||||||
|
*/
|
||||||
|
@SymbolName("Kotlin_AtomicInt_set")
|
||||||
|
external fun set(new: Int): Unit
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Increments value by one.
|
* Increments value by one.
|
||||||
*/
|
*/
|
||||||
@@ -79,6 +85,12 @@ class AtomicLong(private var value: Long = 0) {
|
|||||||
@SymbolName("Kotlin_AtomicLong_compareAndSwap")
|
@SymbolName("Kotlin_AtomicLong_compareAndSwap")
|
||||||
external fun compareAndSwap(expected: Long, new: Long): Long
|
external fun compareAndSwap(expected: Long, new: Long): Long
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the new atomic value.
|
||||||
|
*/
|
||||||
|
@SymbolName("Kotlin_AtomicLong_set")
|
||||||
|
external fun set(new: Long): Unit
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Increments value by one.
|
* Increments value by one.
|
||||||
*/
|
*/
|
||||||
@@ -146,6 +158,14 @@ class AtomicReference<T>(private var value: T? = null) {
|
|||||||
@SymbolName("Kotlin_AtomicReference_compareAndSwap")
|
@SymbolName("Kotlin_AtomicReference_compareAndSwap")
|
||||||
external public fun compareAndSwap(expected: T?, new: T?): T?
|
external public fun compareAndSwap(expected: T?, new: T?): T?
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the value to [new] value
|
||||||
|
* If [new] value is not null, it must be frozen or permanent object, otherwise an
|
||||||
|
* @InvalidMutabilityException is thrown.
|
||||||
|
*/
|
||||||
|
@SymbolName("Kotlin_AtomicReference_set")
|
||||||
|
external public fun set(new: T?): Unit
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the current value.
|
* Returns the current value.
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user