starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-04 05:35:20 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

[PR #14041] [MERGED] Fix potential lags/deadlocks during tab close #29896

New Issue
Open
opened 2026-01-31 09:37:30 +00:00 by claunia · 0 comments
claunia commented 2026-01-31 09:37:30 +00:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/14041
Author: @lhecker
Created: 9/20/2022
Status: ✅ Merged
Merged: 9/21/2022
Merged by: @undefined

Base: main ← Head: dev/lhecker/14032-close-lag

📝 Commits (4)

📊 Changes

9 files changed (+73 additions, -44 deletions)

View changed files

📝 src/cascadia/TerminalConnection/ConptyConnection.cpp (+17 -7)
📝 src/cascadia/TerminalConnection/ConptyConnection.h (+1 -1)
📝 src/inc/conpty-static.h (+2 -0)
📝 src/interactivity/base/ServiceLocator.cpp (+19 -2)
📝 src/interactivity/inc/ServiceLocator.hpp (+1 -4)
📝 src/winconpty/dll/winconpty.def (+1 -0)
📝 src/winconpty/ft_pty/ConPtyTests.cpp (+10 -10)
📝 src/winconpty/winconpty.cpp (+21 -18)
📝 src/winconpty/winconpty.h (+1 -2)

📄 Description

ConptyClosePseudoConsole blocks until OpenConsole exits.
This is problematic for the changes in 666c446, which stopped calling that
function on a background thread to solve a race condition. This commit fixes
the potential lags/deadlocks from waiting on OpenConsole's exit, by adding
ConptyClosePseudoConsoleNoWait which only closes the IO handles and allows
OpenConsole to exit naturally. This uncovered another potential deadlock
in ServiceLocator::RundownAndExit which might call itself recursively.

Closes #14032

Validation Steps Performed

  • Print tons of text and concurrently close the tab.
    Tab closes, OpenConsole/pwsh exits instantly ✅
  • Use Enter-VsDevShell and close the tab.
    Tab closes instantly, OpenConsole/pwsh exits after ~5 seconds ✅

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/microsoft/terminal/pull/14041 **Author:** [@lhecker](https://github.com/lhecker) **Created:** 9/20/2022 **Status:** ✅ Merged **Merged:** 9/21/2022 **Merged by:** [@undefined](undefined) **Base:** `main` ← **Head:** `dev/lhecker/14032-close-lag` --- ### 📝 Commits (4) - [`2f09d15`](https://github.com/microsoft/terminal/commit/2f09d15593c994b555eefb7841e5b461d84e1e75) Fix potential lags/deadlocks during tab close - [`8301e45`](https://github.com/microsoft/terminal/commit/8301e45dd2b363d26be656abdf76862b5b7cd2a0) Fix AuditMode errors - [`e4bccbf`](https://github.com/microsoft/terminal/commit/e4bccbf0ab7192d24332def3c550a5762d6f75bd) Address feedback - [`f142bb9`](https://github.com/microsoft/terminal/commit/f142bb98833d34a7cb1772e845ec249f5d8ae6d7) Address feedback ### 📊 Changes **9 files changed** (+73 additions, -44 deletions) <details> <summary>View changed files</summary> 📝 `src/cascadia/TerminalConnection/ConptyConnection.cpp` (+17 -7) 📝 `src/cascadia/TerminalConnection/ConptyConnection.h` (+1 -1) 📝 `src/inc/conpty-static.h` (+2 -0) 📝 `src/interactivity/base/ServiceLocator.cpp` (+19 -2) 📝 `src/interactivity/inc/ServiceLocator.hpp` (+1 -4) 📝 `src/winconpty/dll/winconpty.def` (+1 -0) 📝 `src/winconpty/ft_pty/ConPtyTests.cpp` (+10 -10) 📝 `src/winconpty/winconpty.cpp` (+21 -18) 📝 `src/winconpty/winconpty.h` (+1 -2) </details> ### 📄 Description `ConptyClosePseudoConsole` blocks until OpenConsole exits. This is problematic for the changes in 666c446, which stopped calling that function on a background thread to solve a race condition. This commit fixes the potential lags/deadlocks from waiting on OpenConsole's exit, by adding `ConptyClosePseudoConsoleNoWait` which only closes the IO handles and allows OpenConsole to exit naturally. This uncovered another potential deadlock in `ServiceLocator::RundownAndExit` which might call itself recursively. Closes #14032 ## Validation Steps Performed * Print tons of text and concurrently close the tab. Tab closes, OpenConsole/pwsh exits instantly ✅ * Use `Enter-VsDevShell` and close the tab. Tab closes instantly, OpenConsole/pwsh exits after ~5 seconds ✅ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
claunia added the pull-request label 2026-01-31 09:37:30 +00:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
⛺ Reserved
A11yCO
A11yMAS
A11ySev1
A11ySev2
A11ySev3
A11yTTValidated
A11yUsable
A11yVoiceAccess
A11yWCAG
Area-Accessibility
Area-AtlasEngine
Area-AzureShell
Area-Build
Area-Build
Area-Chat
Area-CmdPal
Area-CodeHealth
Area-Commandline
Area-CookedRead
Area-DefApp
Area-Extensibility
Area-Fonts
Area-GroupPolicy
Area-i18n
Area-Input
Area-Interaction
Area-Interop
Area-Localization
Area-Output
Area-Performance
Area-Portable
Area-Quality
Area-Remoting
Area-Rendering
Area-Schema
Area-Server
Area-Settings
Area-SettingsUI
Area-ShellExtension
Area-ShellExtension
Area-ShellExtension
Area-Suggestions
Area-Suggestions
Area-TerminalConnection
Area-TerminalControl
Area-Theming
Area-UserInterface
Area-VT
Area-Windowing
Area-WPFControl
AutoMerge
Blocking-Ingestion
Culprit-Centennial
Culprit-WinUI
Disability-All
Disability-Blind
Disability-LowVision
Disability-Mobility
External-Blocked-WinUI3
Fixed
Gathering-Data
good first issue
HCL-E+D
HCL-WindowsTerminal
Help Wanted
Impact-Compatibility
Impact-Compliance
Impact-Correctness
Impact-Visual
In-PR
InclusionBacklog
InclusionBacklog-Windows TerminalWin32
InclusionCommitted-202206
Issue-Bug
Issue-Docs
Issue-Feature
Issue-Feature
Issue-Question
Issue-Samples
Issue-Scenario
Issue-Task
Needs-Attention
Needs-Author-Feedback
Needs-Bisect
Needs-Discussion
Needs-Repro
Needs-Tag-Fix
Needs-Tag-Fix
Needs-Triage
No-Recent-Activity
Priority-0
Priority-1
Priority-2
Priority-3
Product-Cmd.exe
Product-Colortool
Product-Colortool
Product-Colortool
Product-Conhost
Product-Conpty
Product-Meta
Product-Powershell
Product-Terminal
Product-WSL
pull-request
Mirrored from GitHub Pull Request
 Resolution-Answered
Resolution-By-Design
Resolution-Duplicate
Resolution-External
Resolution-Fix-Available
Resolution-Fix-Committed
Resolution-No-Repro
Resolution-Won't-Fix
Severity-Blocking
Severity-Crash
Severity-DataLoss
spam
this-will-be-a-breaking-change
Tracking-External
WindowsTerminal_Win32
Work-Item
zAskModeBug
zInbox-Bug
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
claunia
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#29896
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?