Skip to content

Fix deadlock in whilePaused when re-entered via nested runloop #559

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.

Sign up for GitHub

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

Open
chall37 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix deadlock in whilePaused when re-entered via nested runloop #559

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions sources/TokenExecutor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,12 @@ private class TokenExecutorImpl {
// Runs block synchronously while token executor is stopped.
func whilePaused(_ block: () -> (), onExecutorQueue: Bool) {
dispatchPrecondition(condition: .onQueue(.main))
if iTermGCD.joined {
// Already joined (likely re-entrant via a nested runloop). Avoid deadlock by reusing
// the existing join instead of creating a new one.
block()
return
}
if gDebugLogging.boolValue { DLog("Incr pending pauses if \(iTermPreferences.maximizeThroughput())") }
var unpauser = iTermPreferences.maximizeThroughput() ? nil : TokenExecutor.globalPause()

Expand Down