- Notifications
You must be signed in to change notification settings - Fork112
WIP Android-specific tests for WorkStealingDispatcher.#1371
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Draft
zach-klippenstein wants to merge1 commit intomainChoose a base branch
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Draft
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
96 changes: 96 additions & 0 deletions...dTest/java/com/squareup/workflow1/android/WorkStealingDispatcherAndroidDispatchersTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| package com.squareup.workflow1.android | ||
| import com.squareup.workflow1.internal.WorkStealingDispatcher | ||
| import kotlinx.coroutines.CoroutineDispatcher | ||
| import kotlinx.coroutines.CoroutineScope | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.test.runTest | ||
| import kotlinx.coroutines.withContext | ||
| import kotlinx.coroutines.yield | ||
| import org.junit.Test | ||
| import kotlin.test.assertEquals | ||
| class WorkStealingDispatcherAndroidDispatchersTest { | ||
| @Test fun dispatch_runsImmediatelyWhenDelegateIsMainImmediate_onMainThread() = runTest { | ||
| val dispatcher = WorkStealingDispatcher(Dispatchers.Main.immediate) | ||
| runOnMainThread { | ||
| expect(0) | ||
| dispatcher.dispatch { | ||
| expect(1) | ||
| } | ||
| expect(2) | ||
| } | ||
| } | ||
| @Test fun dispatchNested_enqueuesWhenDelegateIsMainImmediate_onMainThread() = runTest { | ||
| val dispatcher = WorkStealingDispatcher(Dispatchers.Main.immediate) | ||
| runOnMainThread { | ||
| expect(0) | ||
| dispatcher.dispatch { | ||
| expect(1) | ||
| // This dispatch should get enqueued to Unconfined's threadlocal queue. | ||
| dispatcher.dispatch { | ||
| expect(3) | ||
| } | ||
| expect(2) | ||
| } | ||
| expect(4) | ||
| } | ||
| } | ||
| @Test fun dispatch_queues_whenDelegateisMain_onMainThread() = runTest { | ||
| val dispatcher = WorkStealingDispatcher(Dispatchers.Main) | ||
| runOnMainThread { | ||
| expect(0) | ||
| dispatcher.dispatch { | ||
| expect(2) | ||
| } | ||
| expect(1) | ||
| yield() | ||
| expect(3) | ||
| } | ||
| } | ||
| @Test fun dispatch_runsMultipleTasksInOrder_whenDelegateIsMain_onMainThread() = runTest { | ||
| val dispatcher = WorkStealingDispatcher(Dispatchers.Main) | ||
| runOnMainThread { | ||
| expect(0) | ||
| dispatcher.dispatch { | ||
| expect(3) | ||
| } | ||
| expect(1) | ||
| dispatcher.dispatch { | ||
| expect(4) | ||
| } | ||
| expect(2) | ||
| yield() | ||
| expect(5) | ||
| } | ||
| } | ||
| private suspend fun runOnMainThread(block: suspend CoroutineScope.() -> Unit) { | ||
| withContext(Dispatchers.Main, block) | ||
| } | ||
| private fun CoroutineDispatcher.dispatch(block: () -> Unit) { | ||
| dispatch(this) { block() } | ||
| } | ||
| private val expectLock = Any() | ||
| private var current = 0 | ||
| private fun expect(expected: Int) { | ||
| synchronized(expectLock) { | ||
| assertEquals(expected, current, "Expected to be at step $expected but was at $current") | ||
| current++ | ||
| } | ||
| } | ||
| } |
4 changes: 2 additions & 2 deletionsworkflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/Synchronization.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| packagecom.squareup.workflow1.internal | ||
| publicexpectclassLock() | ||
| publicexpectinlinefun <R> Lock.withLock(block: ()->R):R | ||
Comment on lines -3 to +5 CollaboratorAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more.
| ||
2 changes: 1 addition & 1 deletion...w-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/WorkStealingDispatcher.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -38,7 +38,7 @@ import kotlin.coroutines.resume | ||
| * delegate scheduling behavior to. This can either be a confined or unconfined dispatcher, and its | ||
| * behavior will be preserved transparently. | ||
| */ | ||
| public open class WorkStealingDispatcher protected constructor( | ||
CollaboratorAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more.
| ||
| private val delegateInterceptor: ContinuationInterceptor, | ||
| lock: Lock?, | ||
| queue: LinkedHashSet<DelegateDispatchedContinuation>? | ||
4 changes: 2 additions & 2 deletionsworkflow-runtime/src/jvmMain/kotlin/com/squareup/workflow1/internal/Synchronization.jvm.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| packagecom.squareup.workflow1.internal | ||
| publicactualtypealiasLock=Any | ||
| publicactualinlinefun <R> Lock.withLock(block: ()->R):R= synchronized(this, block) | ||
Comment on lines -3 to +5 CollaboratorAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more.
| ||
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.