-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix limitedParallelism implementation on K/N (#3226)
The initial implementation predates new memory model and was never working on it Fixes #3223
- Loading branch information
Showing
4 changed files
with
99 additions
and
28 deletions.
There are no files selected for viewing
This file contains 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
34 changes: 34 additions & 0 deletions
34
kotlinx-coroutines-core/common/test/LimitedParallelismSharedTest.kt
This file contains 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,34 @@ | ||
/* | ||
* 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 testLimitedDefault() = runTest { | ||
// Test that evaluates the very basic completion of tasks in limited dispatcher | ||
// for all supported platforms. | ||
// For more specific and concurrent tests, see 'concurrent' package. | ||
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) | ||
} | ||
} |
59 changes: 59 additions & 0 deletions
59
kotlinx-coroutines-core/concurrent/test/LimitedParallelismConcurrentTest.kt
This file contains 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,59 @@ | ||
/* | ||
* 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 LimitedParallelismConcurrentTest : 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() | ||
} | ||
} | ||
} | ||
|
||
@Test | ||
fun testTaskFairness() = runMtTest { | ||
val executor = newSingleThreadContext("test") | ||
val view = executor.limitedParallelism(1) | ||
val view2 = executor.limitedParallelism(1) | ||
val j1 = launch(view) { | ||
while (true) { | ||
yield() | ||
} | ||
} | ||
val j2 = launch(view2) { j1.cancel() } | ||
joinAll(j1, j2) | ||
executor.close() | ||
} | ||
} |
This file contains 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