Skip to content

Commit 4638d79

Browse files
elizarovelizarov
committed
startUndispatchedCoroutine is renamed to startCoroutineUndispatched for consistency with coroutine intrinsics
1 parent 2de210b commit 4638d79

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

‎kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Deferred.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package kotlinx.coroutines.experimental
1818

19-
import kotlinx.coroutines.experimental.intrinsics.startUndispatchedCoroutine
19+
import kotlinx.coroutines.experimental.intrinsics.startCoroutineUndispatched
2020
import kotlinx.coroutines.experimental.selects.SelectBuilder
2121
import kotlinx.coroutines.experimental.selects.SelectInstance
2222
import kotlinx.coroutines.experimental.selects.select
@@ -177,7 +177,7 @@ private open class DeferredCoroutine<T>(
177177
if (state is CompletedExceptionally)
178178
select.resumeSelectWithException(state.exception, MODE_DIRECT)
179179
else
180-
block.startUndispatchedCoroutine(state as T, select.completion)
180+
block.startCoroutineUndispatched(state as T, select.completion)
181181
}
182182
return
183183
}

‎kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Job.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package kotlinx.coroutines.experimental
1818

1919
import kotlinx.coroutines.experimental.internal.*
20-
import kotlinx.coroutines.experimental.intrinsics.startUndispatchedCoroutine
20+
import kotlinx.coroutines.experimental.intrinsics.startCoroutineUndispatched
2121
import kotlinx.coroutines.experimental.selects.SelectBuilder
2222
import kotlinx.coroutines.experimental.selects.SelectInstance
2323
import kotlinx.coroutines.experimental.selects.select
@@ -617,7 +617,7 @@ public open class JobSupport(active: Boolean) : AbstractCoroutineContextElement(
617617
if (state !is Incomplete) {
618618
// already complete -- select result
619619
if (select.trySelect(idempotent = null))
620-
block.startUndispatchedCoroutine(select.completion)
620+
block.startCoroutineUndispatched(select.completion)
621621
return
622622
}
623623
if (startInternal(state) == 0) {

‎kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/Scheduled.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package kotlinx.coroutines.experimental
1818

19-
import kotlinx.coroutines.experimental.intrinsics.startUndispatchedCoroutine
19+
import kotlinx.coroutines.experimental.intrinsics.startCoroutineUndispatched
2020
import java.util.concurrent.ScheduledExecutorService
2121
import java.util.concurrent.ScheduledThreadPoolExecutor
2222
import java.util.concurrent.TimeUnit
@@ -81,7 +81,7 @@ public suspend fun <T> withTimeout(time: Long, unit: TimeUnit = TimeUnit.MILLISE
8181
cont.cancelFutureOnCompletion(scheduledExecutor.schedule(cont, time, unit))
8282
// restart block using cancellable context of this continuation,
8383
// however start it as undispatched coroutine, because we are already in the proper context
84-
block.startUndispatchedCoroutine(cont)
84+
block.startCoroutineUndispatched(cont)
8585
cont.getResult()
8686
}
8787
}

‎kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/channels/AbstractChannel.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package kotlinx.coroutines.experimental.channels
1818

1919
import kotlinx.coroutines.experimental.*
2020
import kotlinx.coroutines.experimental.internal.*
21-
import kotlinx.coroutines.experimental.intrinsics.startUndispatchedCoroutine
21+
import kotlinx.coroutines.experimental.intrinsics.startCoroutineUndispatched
2222
import kotlinx.coroutines.experimental.selects.SelectInstance
2323
import kotlin.coroutines.experimental.startCoroutine
2424

@@ -341,7 +341,7 @@ public abstract class AbstractChannel<E> : Channel<E> {
341341
offerResult === ALREADY_SELECTED -> return
342342
offerResult === OFFER_FAILED -> {} // retry
343343
offerResult === OFFER_SUCCESS -> {
344-
block.startUndispatchedCoroutine(select.completion)
344+
block.startCoroutineUndispatched(select.completion)
345345
return
346346
}
347347
offerResult is Closed<*> -> throw offerResult.sendException
@@ -531,7 +531,7 @@ public abstract class AbstractChannel<E> : Channel<E> {
531531
pollResult === POLL_FAILED -> {} // retry
532532
pollResult is Closed<*> -> throw pollResult.receiveException
533533
else -> {
534-
block.startUndispatchedCoroutine(pollResult as E, select.completion)
534+
block.startCoroutineUndispatched(pollResult as E, select.completion)
535535
return
536536
}
537537
}
@@ -559,14 +559,14 @@ public abstract class AbstractChannel<E> : Channel<E> {
559559
pollResult is Closed<*> -> {
560560
if (pollResult.closeCause == null) {
561561
if (select.trySelect(idempotent = null))
562-
block.startUndispatchedCoroutine(null, select.completion)
562+
block.startCoroutineUndispatched(null, select.completion)
563563
return
564564
} else
565565
throw pollResult.closeCause
566566
}
567567
else -> {
568568
// selected successfully
569-
block.startUndispatchedCoroutine(pollResult as E, select.completion)
569+
block.startCoroutineUndispatched(pollResult as E, select.completion)
570570
return
571571
}
572572
}

‎kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/intrinsics/Undispatched.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package kotlinx.coroutines.experimental.intrinsics
1818

1919
import kotlin.coroutines.experimental.Continuation
20-
import kotlin.coroutines.experimental.intrinsics.COROUTINE_SUSPENDED
20+
import kotlin.coroutines.experimental.intrinsics.*
2121
import kotlin.coroutines.experimental.suspendCoroutine
2222

2323
/**
@@ -26,9 +26,9 @@ import kotlin.coroutines.experimental.suspendCoroutine
2626
* @suppress **This is unstable API and it is subject to change.**
2727
*/
2828
@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
29-
internal fun <R> (suspend () -> R).startUndispatchedCoroutine(completion: Continuation<R>) {
29+
internal fun <R> (suspend () -> R).startCoroutineUndispatched(completion: Continuation<R>) {
3030
val value = try {
31-
(this as kotlin.jvm.functions.Function1<Continuation<R>, Any?>).invoke(completion)
31+
startCoroutineUninterceptedOrReturn(completion)
3232
} catch (e: Throwable) {
3333
completion.resumeWithException(e)
3434
return
@@ -43,9 +43,9 @@ internal fun <R> (suspend () -> R).startUndispatchedCoroutine(completion: Contin
4343
* @suppress **This is unstable API and it is subject to change.**
4444
*/
4545
@Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
46-
internal fun <E, R> (suspend (E) -> R).startUndispatchedCoroutine(element: E, completion: Continuation<R>) {
46+
internal fun <E, R> (suspend (E) -> R).startCoroutineUndispatched(element: E, completion: Continuation<R>) {
4747
val value = try {
48-
(this as kotlin.jvm.functions.Function2<E, Continuation<R>, Any?>).invoke(element, completion)
48+
startCoroutineUninterceptedOrReturn(element, completion)
4949
} catch (e: Throwable) {
5050
completion.resumeWithException(e)
5151
return

‎kotlinx-coroutines-core/src/main/kotlin/kotlinx/coroutines/experimental/sync/Mutex.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package kotlinx.coroutines.experimental.sync
1818

1919
import kotlinx.coroutines.experimental.*
2020
import kotlinx.coroutines.experimental.internal.*
21-
import kotlinx.coroutines.experimental.intrinsics.startUndispatchedCoroutine
21+
import kotlinx.coroutines.experimental.intrinsics.startCoroutineUndispatched
2222
import kotlinx.coroutines.experimental.selects.SelectBuilder
2323
import kotlinx.coroutines.experimental.selects.SelectInstance
2424
import kotlinx.coroutines.experimental.selects.select
@@ -217,7 +217,7 @@ internal class MutexImpl(locked: Boolean) : Mutex {
217217
val failure = select.performAtomicTrySelect(TryLockDesc(this, owner))
218218
when {
219219
failure == null -> { // success
220-
block.startUndispatchedCoroutine(select.completion)
220+
block.startCoroutineUndispatched(select.completion)
221221
return
222222
}
223223
failure === ALREADY_SELECTED -> return // already selected -- bail out

‎kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/selects/SelectArrayChannelTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package kotlinx.coroutines.experimental.selects
1919
import kotlinx.coroutines.experimental.TestBase
2020
import kotlinx.coroutines.experimental.channels.ArrayChannel
2121
import kotlinx.coroutines.experimental.channels.ClosedReceiveChannelException
22-
import kotlinx.coroutines.experimental.intrinsics.startUndispatchedCoroutine
22+
import kotlinx.coroutines.experimental.intrinsics.startCoroutineUndispatched
2323
import kotlinx.coroutines.experimental.launch
2424
import kotlinx.coroutines.experimental.runBlocking
2525
import kotlinx.coroutines.experimental.yield
@@ -304,6 +304,6 @@ class SelectArrayChannelTest : TestBase() {
304304
internal fun <R> SelectBuilder<R>.default(block: suspend () -> R) {
305305
this as SelectBuilderImpl // type assertion
306306
if (!trySelect(null)) return
307-
block.startUndispatchedCoroutine(this)
307+
block.startCoroutineUndispatched(this)
308308
}
309309
}

‎kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/selects/SelectRendezvousChannelTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package kotlinx.coroutines.experimental.selects
1919
import kotlinx.coroutines.experimental.TestBase
2020
import kotlinx.coroutines.experimental.channels.ClosedReceiveChannelException
2121
import kotlinx.coroutines.experimental.channels.RendezvousChannel
22-
import kotlinx.coroutines.experimental.intrinsics.startUndispatchedCoroutine
22+
import kotlinx.coroutines.experimental.intrinsics.startCoroutineUndispatched
2323
import kotlinx.coroutines.experimental.launch
2424
import kotlinx.coroutines.experimental.runBlocking
2525
import kotlinx.coroutines.experimental.yield
@@ -324,6 +324,6 @@ class SelectRendezvousChannelTest : TestBase() {
324324
internal fun <R> SelectBuilder<R>.default(block: suspend () -> R) {
325325
this as SelectBuilderImpl // type assertion
326326
if (!trySelect(null)) return
327-
block.startUndispatchedCoroutine(this)
327+
block.startCoroutineUndispatched(this)
328328
}
329329
}

0 commit comments

Comments
 (0)