azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed KT-15963 (coroutines machinery should not use equals on results)

Browse Source
This commit is contained in:
Roman Elizarov
2017-01-26 10:29:49 +03:00
committed by Denis Zharkov
parent c362a9154b
commit 8dc318dd92
4 changed files with 97 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/src/kotlin/coroutines/experimental/CoroutinesLibrary.kt
+13 -16
View File
@@ -157,19 +157,16 @@ internal class SafeContinuation<in T> @PublishedApi internal constructor(private
companion object {
@Suppress("UNCHECKED_CAST")
@JvmStatic
private val RESULT_UPDATER = AtomicReferenceFieldUpdater.newUpdater<SafeContinuation<*>, Any?>(
private val RESULT = AtomicReferenceFieldUpdater.newUpdater<SafeContinuation<*>, Any?>(
SafeContinuation::class.java, Any::class.java as Class<Any?>, "result")
}
private fun cas(expect: Any?, update: Any?): Boolean =
RESULT_UPDATER.compareAndSet(this, expect, update)
override fun resume(value: T) {
while (true) { // lock-free loop
val result = this.result // atomic read
when (result) {
UNDECIDED -> if (cas(UNDECIDED, value)) return
COROUTINE_SUSPENDED -> if (cas(COROUTINE_SUSPENDED, RESUMED)) {
when {
result === UNDECIDED -> if (RESULT.compareAndSet(this, UNDECIDED, value)) return
result === COROUTINE_SUSPENDED -> if (RESULT.compareAndSet(this, COROUTINE_SUSPENDED, RESUMED)) {
delegate.resume(value)
return
}
@@ -181,9 +178,9 @@ internal class SafeContinuation<in T> @PublishedApi internal constructor(private
override fun resumeWithException(exception: Throwable) {
while (true) { // lock-free loop
val result = this.result // atomic read
when (result) {
UNDECIDED -> if (cas(UNDECIDED, Fail(exception))) return
COROUTINE_SUSPENDED -> if (cas(COROUTINE_SUSPENDED, RESUMED)) {
when {
result === UNDECIDED -> if (RESULT.compareAndSet(this, UNDECIDED, Fail(exception))) return
result === COROUTINE_SUSPENDED -> if (RESULT.compareAndSet(this, COROUTINE_SUSPENDED, RESUMED)) {
delegate.resumeWithException(exception)
return
}
@@ -195,14 +192,14 @@ internal class SafeContinuation<in T> @PublishedApi internal constructor(private
@PublishedApi
internal fun getResult(): Any? {
var result = this.result // atomic read
if (result == UNDECIDED) {
if (cas(UNDECIDED, COROUTINE_SUSPENDED)) return COROUTINE_SUSPENDED
if (result === UNDECIDED) {
if (RESULT.compareAndSet(this, UNDECIDED, COROUTINE_SUSPENDED)) return COROUTINE_SUSPENDED
result = this.result // reread volatile var
}
when (result) {
RESUMED -> return COROUTINE_SUSPENDED // already called continuation, indicate COROUTINE_SUSPENDED upstream
is Fail -> throw result.exception
else -> return result // either COROUTINE_SUSPENDED or data
when {
result === RESUMED -> return COROUTINE_SUSPENDED // already called continuation, indicate SUSPENDED_MARKER upstream
result is Fail -> throw result.exception
else -> return result // either SUSPENDED_MARKER or data
}
}
}
libraries/stdlib/src/kotlin/coroutines/experimental/jvm/internal/CoroutineImpl.kt
+2 -2
View File
@@ -51,7 +51,7 @@ abstract class CoroutineImpl(
override fun resume(value: Any?) {
try {
val result = doResume(value, null)
if (result != COROUTINE_SUSPENDED)
if (result !== COROUTINE_SUSPENDED)
completion!!.resume(result)
} catch (e: Throwable) {
completion!!.resumeWithException(e)
@@ -61,7 +61,7 @@ abstract class CoroutineImpl(
override fun resumeWithException(exception: Throwable) {
try {
val result = doResume(null, exception)
if (result != COROUTINE_SUSPENDED)
if (result !== COROUTINE_SUSPENDED)
completion!!.resume(result)
} catch (e: Throwable) {
completion!!.resumeWithException(e)