starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-09-25 08:24:54 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

[PR #3488] [MERGED] Revert locking changes #25389

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

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/3488
Author: @miniksa
Created: 11/8/2019
Status: ✅ Merged
Merged: 11/8/2019
Merged by: @miniksa

Base: master ← Head: dev/miniksa/undo-lock

📝 Commits (1)

  • 1dc0275 Revert "Rework locking and eventing during startup and shutdown to alleviate some VT issues (#2525)"

📊 Changes

33 files changed (+290 additions, -480 deletions)

View changed files

📝 src/host/PtySignalInputThread.cpp (+54 -22)
📝 src/host/PtySignalInputThread.hpp (+3 -5)
📝 src/host/VtInputThread.cpp (+38 -82)
📝 src/host/VtInputThread.hpp (+5 -11)
📝 src/host/VtIo.cpp (+65 -88)
📝 src/host/VtIo.hpp (+8 -7)
📝 src/host/ft_host/Host.FeatureTests.vcxproj (+0 -1)
📝 src/host/ft_host/Host.FeatureTests.vcxproj.filters (+0 -3)
📝 src/host/ft_host/sources (+0 -1)
📝 src/host/globals.h (+1 -2)
📝 src/host/output.cpp (+11 -12)
📝 src/host/srvinit.cpp (+6 -10)
📝 src/host/ut_host/VtIoTests.cpp (+4 -31)
📝 src/host/ut_host/VtRendererTests.cpp (+14 -20)
➕ src/inc/ITerminalOwner.hpp (+33 -0)
📝 src/inc/LibraryIncludes.h (+0 -1)
📝 src/interactivity/onecore/ConIoSrvComm.cpp (+1 -1)
📝 src/interactivity/onecore/ConsoleInputThread.cpp (+1 -1)
📝 src/interactivity/win32/windowio.cpp (+7 -11)
📝 src/interactivity/win32/windowproc.cpp (+9 -49)

...and 13 more files

📄 Description

Summary of the Pull Request

This reverts #2525 because it caused numerous issues in the Windows inbox product around WSL. We'll have to revisit it in the future.

PR Checklist

Detailed Description of the Pull Request / Additional comments

Several odd crashes started occurring in Windows, WSL was no longer able to reliably pull the last bytes out of the output during interop operations, and a few other things. We had to revert this for 20h1. This is just the reflection of the Windows-side change back to the outside.

We plan to get back to #1810 in the future, adding more tests around WSL, and probably slightly reducing scope on the locking changes.

Validation Steps Performed

Windows builds validated this.
I've validated the changes back locally.
WSL team validated the revert fixes their 20h1 inbox issues.
The automated tests will run when I push this.

🔄 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/3488 **Author:** [@miniksa](https://github.com/miniksa) **Created:** 11/8/2019 **Status:** ✅ Merged **Merged:** 11/8/2019 **Merged by:** [@miniksa](https://github.com/miniksa) **Base:** `master` ← **Head:** `dev/miniksa/undo-lock` --- ### 📝 Commits (1) - [`1dc0275`](https://github.com/microsoft/terminal/commit/1dc02754db7c85c7ece1fa3727670a7b4d92a30e) Revert "Rework locking and eventing during startup and shutdown to alleviate some VT issues (#2525)" ### 📊 Changes **33 files changed** (+290 additions, -480 deletions) <details> <summary>View changed files</summary> 📝 `src/host/PtySignalInputThread.cpp` (+54 -22) 📝 `src/host/PtySignalInputThread.hpp` (+3 -5) 📝 `src/host/VtInputThread.cpp` (+38 -82) 📝 `src/host/VtInputThread.hpp` (+5 -11) 📝 `src/host/VtIo.cpp` (+65 -88) 📝 `src/host/VtIo.hpp` (+8 -7) 📝 `src/host/ft_host/Host.FeatureTests.vcxproj` (+0 -1) 📝 `src/host/ft_host/Host.FeatureTests.vcxproj.filters` (+0 -3) 📝 `src/host/ft_host/sources` (+0 -1) 📝 `src/host/globals.h` (+1 -2) 📝 `src/host/output.cpp` (+11 -12) 📝 `src/host/srvinit.cpp` (+6 -10) 📝 `src/host/ut_host/VtIoTests.cpp` (+4 -31) 📝 `src/host/ut_host/VtRendererTests.cpp` (+14 -20) ➕ `src/inc/ITerminalOwner.hpp` (+33 -0) 📝 `src/inc/LibraryIncludes.h` (+0 -1) 📝 `src/interactivity/onecore/ConIoSrvComm.cpp` (+1 -1) 📝 `src/interactivity/onecore/ConsoleInputThread.cpp` (+1 -1) 📝 `src/interactivity/win32/windowio.cpp` (+7 -11) 📝 `src/interactivity/win32/windowproc.cpp` (+9 -49) _...and 13 more files_ </details> ### 📄 Description <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request This reverts #2525 because it caused numerous issues in the Windows inbox product around WSL. We'll have to revisit it in the future. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist * [x] Reopens #1810 * [x] I work here * [x] Tests removed, the rest still pass * [x] No, the doc update we made is still relevant. * [x] I'm a core contributor. <!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments Several odd crashes started occurring in Windows, WSL was no longer able to reliably pull the last bytes out of the output during interop operations, and a few other things. We had to revert this for 20h1. This is just the reflection of the Windows-side change back to the outside. We plan to get back to #1810 in the future, adding more tests around WSL, and probably slightly reducing scope on the locking changes. <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed Windows builds validated this. I've validated the changes back locally. WSL team validated the revert fixes their 20h1 inbox issues. The automated tests will run when I push this. --- <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:09:13 +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#25389
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?