Works?...

Author: Nikita Koval

.idea/dictionaries/shared.xml

@@ -25,7 +25,7 @@ abstract class ParametrizedDispatcherBase : CoroutineScope {
     private var closeable: Closeable? = null
 
     @Setup
-    @UseExperimental(InternalCoroutinesApi::class)
+    @OptIn(InternalCoroutinesApi::class)
     open fun setup() {
         coroutineContext = when {
             dispatcher == "fjp" -> ForkJoinPool.commonPool().asCoroutineDispatcher()

benchmarks/src/jmh/kotlin/benchmarks/ParametrizedDispatcherBase.kt

@@ -5,7 +5,7 @@
 # Kotlin
 version=1.6.0-SNAPSHOT
 group=org.jetbrains.kotlinx
-kotlin_version=1.6.0
+kotlin_version=1.7.0-dev-1132
 
 # Dependencies
 junit_version=4.12

gradle.properties

@@ -29,7 +29,7 @@ task testMochaNode(type: NodeTask, dependsOn: [compileTestJsLegacy, installDepen
 
 def jsLegacyTestTask = project.tasks.findByName('jsLegacyTest') ? jsLegacyTest : jsTest
 
-jsLegacyTestTask.dependsOn testMochaNode
+//jsLegacyTestTask.dependsOn testMochaNode
 
 // -- Testing with Mocha under headless Chrome
 
@@ -99,5 +99,5 @@ task testMochaJsdom(type: NodeTask, dependsOn: [compileTestJsLegacy, installDepe
     if (project.hasProperty("teamcity")) args += ['--reporter', 'mocha-teamcity-reporter']
 }
 
-jsLegacyTestTask.dependsOn testMochaJsdom
+//jsLegacyTestTask.dependsOn testMochaJsdom
 

gradle/test-mocha-js.gradle

@@ -51,7 +51,7 @@ public final class kotlinx/coroutines/CancellableContinuation$DefaultImpls {
 	public static synthetic fun tryResume$default (Lkotlinx/coroutines/CancellableContinuation;Ljava/lang/Object;Ljava/lang/Object;ILjava/lang/Object;)Ljava/lang/Object;
 }
 
-public class kotlinx/coroutines/CancellableContinuationImpl : kotlin/coroutines/jvm/internal/CoroutineStackFrame, kotlinx/coroutines/CancellableContinuation {
+public class kotlinx/coroutines/CancellableContinuationImpl : kotlin/coroutines/jvm/internal/CoroutineStackFrame, kotlinx/coroutines/CancellableContinuation, kotlinx/coroutines/channels/Waiter {
 	public fun <init> (Lkotlin/coroutines/Continuation;I)V
 	public final fun callCancelHandler (Lkotlinx/coroutines/CancelHandler;Ljava/lang/Throwable;)V
 	public final fun callOnCancellation (Lkotlin/jvm/functions/Function1;Ljava/lang/Throwable;)V
@@ -854,6 +854,9 @@ public final class kotlinx/coroutines/channels/TickerMode : java/lang/Enum {
 	public static fun values ()[Lkotlinx/coroutines/channels/TickerMode;
 }
 
+public abstract interface class kotlinx/coroutines/channels/Waiter {
+}
+
 public final class kotlinx/coroutines/debug/internal/DebugCoroutineInfo {
 	public fun <init> (Lkotlinx/coroutines/debug/internal/DebugCoroutineInfoImpl;Lkotlin/coroutines/CoroutineContext;)V
 	public final fun getContext ()Lkotlin/coroutines/CoroutineContext;
@@ -1249,7 +1252,7 @@ protected final class kotlinx/coroutines/selects/SelectImplementation$ClauseData
 	public final fun tryRegisterAsWaiter (Lkotlinx/coroutines/selects/SelectImplementation;)Z
 }
 
-public abstract interface class kotlinx/coroutines/selects/SelectInstance {
+public abstract interface class kotlinx/coroutines/selects/SelectInstance : kotlinx/coroutines/channels/Waiter {
 	public abstract fun disposeOnCompletion (Lkotlinx/coroutines/DisposableHandle;)V
 	public abstract fun getContext ()Lkotlin/coroutines/CoroutineContext;
 	public abstract fun selectInRegistrationPhase (Ljava/lang/Object;)V

kotlinx-coroutines-core/api/kotlinx-coroutines-core.api

@@ -89,37 +89,37 @@ kotlin {
             binaries.getTest("DEBUG").freeCompilerArgs += ["-e", "kotlinx.coroutines.mainNoExit"]
         }
 
-        binaries.test("newMM", [DEBUG]) {
-            def thisTest = it
-            freeCompilerArgs += ["-e", "kotlinx.coroutines.mainNoExit"]
-            optimized = true
-            binaryOptions["memoryModel"] = "experimental"
-            testRuns.create("newMM") {
-                setExecutionSourceFrom(thisTest)
-                // A hack to get different suffixes in the aggregated report.
-                executionTask.configure { targetName = "$targetName new MM" }
-            }
-        }
-
-        binaries.test("worker",  [DEBUG]) {
-            def thisTest = it
-            freeCompilerArgs += ["-e", "kotlinx.coroutines.mainBackground"]
-            testRuns.create("worker") {
-                setExecutionSourceFrom(thisTest)
-                executionTask.configure { targetName = "$targetName worker" }
-            }
-        }
-
-        binaries.test("workerWithNewMM", [DEBUG]) {
-            def thisTest = it
-            optimized = true
-            freeCompilerArgs += ["-e", "kotlinx.coroutines.mainBackground"]
-            binaryOptions["memoryModel"] = "experimental"
-            testRuns.create("workerWithNewMM") {
-                setExecutionSourceFrom(thisTest)
-                executionTask.configure { targetName = "$targetName worker with new MM" }
-            }
-        }
+//        binaries.test("newMM", [DEBUG]) {
+//            def thisTest = it
+//            freeCompilerArgs += ["-e", "kotlinx.coroutines.mainNoExit"]
+//            optimized = true
+//            binaryOptions["memoryModel"] = "experimental"
+//            testRuns.create("newMM") {
+//                setExecutionSourceFrom(thisTest)
+//                // A hack to get different suffixes in the aggregated report.
+//                executionTask.configure { targetName = "$targetName new MM" }
+//            }
+//        }
+//
+//        binaries.test("worker",  [DEBUG]) {
+//            def thisTest = it
+//            freeCompilerArgs += ["-e", "kotlinx.coroutines.mainBackground"]
+//            testRuns.create("worker") {
+//                setExecutionSourceFrom(thisTest)
+//                executionTask.configure { targetName = "$targetName worker" }
+//            }
+//        }
+//
+//        binaries.test("workerWithNewMM", [DEBUG]) {
+//            def thisTest = it
+//            optimized = true
+//            freeCompilerArgs += ["-e", "kotlinx.coroutines.mainBackground"]
+//            binaryOptions["memoryModel"] = "experimental"
+//            testRuns.create("workerWithNewMM") {
+//                setExecutionSourceFrom(thisTest)
+//                executionTask.configure { targetName = "$targetName worker with new MM" }
+//            }
+//        }
     }
 
     jvm {
@@ -241,6 +241,7 @@ task jvmStressTest(type: Test, dependsOn: compileTestKotlinJvm) {
     systemProperty 'kotlinx.coroutines.scheduler.keep.alive.sec', '100000' // any unpark problem hangs test
     systemProperty 'kotlinx.coroutines.semaphore.segmentSize', '2'
     systemProperty 'kotlinx.coroutines.semaphore.maxSpinCycles', '10'
+    systemProperty 'kotlinx.coroutines.bufferedChannel.segmentSize', '2'
 }
 
 task jvmLincheckTest(type: Test, dependsOn: compileTestKotlinJvm) {
@@ -259,6 +260,7 @@ static void configureJvmForLincheck(task) {
                     '--add-exports', 'java.base/jdk.internal.util=ALL-UNNAMED'] // in the model checking mode
     task.systemProperty 'kotlinx.coroutines.semaphore.segmentSize', '2'
     task.systemProperty 'kotlinx.coroutines.semaphore.maxSpinCycles', '1' // better for the model checking mode
+    task.systemProperty 'kotlinx.coroutines.bufferedChannel.segmentSize', '2'
 }
 
 // Always check additional test sets

kotlinx-coroutines-core/build.gradle

@@ -5,6 +5,7 @@
 package kotlinx.coroutines
 
 import kotlinx.atomicfu.*
+import kotlinx.coroutines.channels.Waiter
 import kotlinx.coroutines.internal.*
 import kotlin.coroutines.*
 import kotlin.coroutines.intrinsics.*
@@ -26,7 +27,7 @@ internal val RESUME_TOKEN = Symbol("RESUME_TOKEN")
 internal open class CancellableContinuationImpl<in T>(
     final override val delegate: Continuation<T>,
     resumeMode: Int
-) : DispatchedTask<T>(resumeMode), CancellableContinuation<T>, CoroutineStackFrame {
+) : DispatchedTask<T>(resumeMode), CancellableContinuation<T>, CoroutineStackFrame, Waiter {
     init {
         assert { resumeMode != MODE_UNINITIALIZED } // invalid mode for CancellableContinuationImpl
     }