-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Fix limitedParallelism implementation on K/N #3226
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
30 changes: 30 additions & 0 deletions
30
kotlinx-coroutines-core/common/test/LimitedParallelismSharedTest.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,30 @@ | ||
/* | ||
* Copyright 2016-2022 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. | ||
*/ | ||
|
||
package kotlinx.coroutines | ||
|
||
import kotlin.test.* | ||
|
||
class LimitedParallelismSharedTest : TestBase() { | ||
@Test | ||
fun testTaskFairness() = runTest { | ||
val view = Dispatchers.Default.limitedParallelism(1) | ||
val view2 = Dispatchers.Default.limitedParallelism(1) | ||
val j1 = launch(view) { | ||
while (true) { | ||
yield() | ||
} | ||
} | ||
val j2 = launch(view2) { j1.cancel() } | ||
joinAll(j1, j2) | ||
} | ||
|
||
@Test | ||
fun testParallelismSpec() { | ||
assertFailsWith<IllegalArgumentException> { Dispatchers.Default.limitedParallelism(0) } | ||
assertFailsWith<IllegalArgumentException> { Dispatchers.Default.limitedParallelism(-1) } | ||
assertFailsWith<IllegalArgumentException> { Dispatchers.Default.limitedParallelism(Int.MIN_VALUE) } | ||
Dispatchers.Default.limitedParallelism(Int.MAX_VALUE) | ||
} | ||
} |
44 changes: 44 additions & 0 deletions
44
kotlinx-coroutines-core/concurrent/test/LimitedParallelismSharedStressTest.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,44 @@ | ||
/* | ||
* Copyright 2016-2022 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. | ||
*/ | ||
|
||
import kotlinx.atomicfu.* | ||
import kotlinx.coroutines.* | ||
import kotlinx.coroutines.exceptions.* | ||
import kotlin.test.* | ||
|
||
class LimitedParallelismSharedStressTest : TestBase() { | ||
|
||
private val targetParallelism = 4 | ||
private val iterations = 100_000 | ||
private val parallelism = atomic(0) | ||
|
||
private fun checkParallelism() { | ||
val value = parallelism.incrementAndGet() | ||
randomWait() | ||
assertTrue { value <= targetParallelism } | ||
parallelism.decrementAndGet() | ||
} | ||
|
||
@Test | ||
fun testLimitedExecutor() = runMtTest { | ||
val executor = newFixedThreadPoolContext(targetParallelism, "test") | ||
val view = executor.limitedParallelism(targetParallelism) | ||
doStress { | ||
repeat(iterations) { | ||
launch(view) { | ||
checkParallelism() | ||
} | ||
} | ||
} | ||
executor.close() | ||
} | ||
|
||
private suspend inline fun doStress(crossinline block: suspend CoroutineScope.() -> Unit) { | ||
repeat(stressTestMultiplier) { | ||
coroutineScope { | ||
block() | ||
} | ||
} | ||
} | ||
} |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion: move this test to the JS source-set, and move the
testTaskFairness
test from the JVM source-set toconcurrent
. This way, there will still be two versions of the test, but each one will be the most specific one for each target.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Left this one as is to still have common coverage and added test with
newSingleThreadContext
toconcurrent
source set. Juggled with names a bit as wellThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, but I think having this test looks confusing. Maybe add a comment?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, done