Skip to content

Fix cancelled delayed jobs not being disposed of in TestDispatcher #3441

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 3 commits into from
Sep 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion kotlinx-coroutines-test/common/src/TestDispatcher.kt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,14 @@ public abstract class TestDispatcher internal constructor() : CoroutineDispatche
/** @suppress */
override fun scheduleResumeAfterDelay(timeMillis: Long, continuation: CancellableContinuation<Unit>) {
val timedRunnable = CancellableContinuationRunnable(continuation, this)
scheduler.registerEvent(this, timeMillis, timedRunnable, continuation.context, ::cancellableRunnableIsCancelled)
val handle = scheduler.registerEvent(
this,
timeMillis,
timedRunnable,
continuation.context,
::cancellableRunnableIsCancelled
)
continuation.disposeOnCancellation(handle)
}

/** @suppress */
Expand Down
23 changes: 23 additions & 0 deletions kotlinx-coroutines-test/jvm/test/MemoryLeakTest.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Copyright 2016-2022 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
*/
import kotlinx.coroutines.*
import kotlinx.coroutines.test.*
import kotlin.test.*

class MemoryLeakTest {

@Test
fun testCancellationLeakInTestCoroutineScheduler() = runTest {
val leakingObject = Any()
val job = launch(start = CoroutineStart.UNDISPATCHED) {
delay(1)
// This code is needed to hold a reference to `leakingObject` until the job itself is weakly reachable.
leakingObject.hashCode()
}
job.cancel()
FieldWalker.assertReachableCount(1, testScheduler) { it === leakingObject }
runCurrent()
FieldWalker.assertReachableCount(0, testScheduler) { it === leakingObject }
}
}