Implement a timeout for PSEUDOCONSOLE_INHERIT_CURSOR #17574
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lhecker
added
the
Product-Conpty
microsoft-github-policy-service
bot
added
Issue-Bug
DHowett
reviewed
Jul 16, 2024
| return _encounteredWin32InputModeSequence; | ||
| // Technically we should decrement the timeout with each iteration, | ||
| // but I suspect infinite spurious wake-ups are a theoretical problem. | ||
| while (!_lookingForDSR.load(std::memory_order::relaxed)) |
There was a problem hiding this comment.
Doesn't this condition need to go the other way? We want to atomic_wait while _lookingForDSR is true.
There was a problem hiding this comment.
I've done my brain in trying to figure this out
There was a problem hiding this comment.
Oh look @zadjii-msft! Dustin found the actual source of the bug. 😅
It's not that it timeouts, but rather that it doesn't wait for the answer to begin with.
lhecker
commented
Jul 16, 2024
| @@ -57,79 +43,67 @@ VtInputThread::VtInputThread(_In_ wil::unique_hfile hPipe, | |||
| // - The return value of the underlying instance's _InputThread | |||
| DWORD WINAPI VtInputThread::StaticVtInputThreadProc(_In_ LPVOID lpParameter) | |||
| { | |||
| const auto pInstance = reinterpret_cast<VtInputThread*>(lpParameter); | |||
| const auto pInstance = static_cast<VtInputThread*>(lpParameter); | |||
There was a problem hiding this comment.
The diff in this file is a lot smaller with suppressed whitespace changes: https://github.com/microsoft/terminal/pull/17574/files?w=1
DHowett
approved these changes
Jul 16, 2024
carlos-zamora
approved these changes
Jul 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This implements a 3s timeout for cursor inheritance which prevents
ConPTY from being deadlocked at startup, if the terminal misbehaves.
It serves another purpose, however, in that it prepares the code for
the introduction of overlapped IO in #17510.
Closes #11213