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 #5353] [MERGED] Add support for renderer backoff, don't FAIL_FAST on 3x failures, add UI #26267

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

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/5353
Author: @DHowett-MSFT
Created: 4/14/2020
Status: ✅ Merged
Merged: 4/14/2020
Merged by: @undefined

Base: master ← Head: dev/duhowett/eyes_off_the_prize

📝 Commits (4)

  • c2fcdf3 Renderer: Add support for backoff and auto-disable on failed retry
  • 57ead2d Wire TermControl's Render Failed handler up to show some auxiliary UI
  • eb934e4 Constantize
  • 621e595 Commentize

📊 Changes

9 files changed (+106 additions, -2 deletions)

View changed files

📝 src/cascadia/TerminalControl/Resources/en-US/Resources.resw (+7 -1)
📝 src/cascadia/TerminalControl/TermControl.cpp (+32 -0)
📝 src/cascadia/TerminalControl/TermControl.h (+2 -0)
📝 src/cascadia/TerminalControl/TermControl.xaml (+17 -0)
📝 src/renderer/base/renderer.cpp (+35 -1)
📝 src/renderer/base/renderer.hpp (+5 -0)
📝 src/renderer/base/thread.cpp (+6 -0)
📝 src/renderer/base/thread.hpp (+1 -0)
📝 src/renderer/inc/IRenderThread.hpp (+1 -0)

📄 Description

Summary of the Pull Request

Renderer: Add support for backoff and auto-disable on failed retry

This commit introduces a backoff (150ms * number of tries) to the
renderer's retry logic (introduced in #2830). It also changes the
FAIL_FAST to a less globally-harmful render thread disable, so that we
stop blowing up any application hosting a terminal when the graphics
driver goes away.

In addition, it adds a callback that a Renderer consumer can use to
determine when the renderer has failed, and a public method to kick it
back into life.

Fixes #5340.

This PR also wires up TermControl so that it shows some UI when the renderer tastes clay.

image

image

PR Checklist

Validation Steps Performed

I tested this by dropping the number of retries to 1 and forcing a TDR while doing wsl cmatrix -u0. It picked up exactly where it left off.

As a bonus, you can actually still type into the terminal when it's graphically suspended (and exit still works.). The block is entirely graphical.

🔄 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/5353 **Author:** [@DHowett-MSFT](https://github.com/DHowett-MSFT) **Created:** 4/14/2020 **Status:** ✅ Merged **Merged:** 4/14/2020 **Merged by:** [@undefined](undefined) **Base:** `master` ← **Head:** `dev/duhowett/eyes_off_the_prize` --- ### 📝 Commits (4) - [`c2fcdf3`](https://github.com/microsoft/terminal/commit/c2fcdf3d395262f6a4d4739fc746e53c09169158) Renderer: Add support for backoff and auto-disable on failed retry - [`57ead2d`](https://github.com/microsoft/terminal/commit/57ead2d0674c35e4b0cddbde5188aff193adfdaa) Wire TermControl's Render Failed handler up to show some auxiliary UI - [`eb934e4`](https://github.com/microsoft/terminal/commit/eb934e409e2e63a9fa43b253acd2248568cce173) Constantize - [`621e595`](https://github.com/microsoft/terminal/commit/621e595170204e980488c55655b492dcf8559476) Commentize ### 📊 Changes **9 files changed** (+106 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `src/cascadia/TerminalControl/Resources/en-US/Resources.resw` (+7 -1) 📝 `src/cascadia/TerminalControl/TermControl.cpp` (+32 -0) 📝 `src/cascadia/TerminalControl/TermControl.h` (+2 -0) 📝 `src/cascadia/TerminalControl/TermControl.xaml` (+17 -0) 📝 `src/renderer/base/renderer.cpp` (+35 -1) 📝 `src/renderer/base/renderer.hpp` (+5 -0) 📝 `src/renderer/base/thread.cpp` (+6 -0) 📝 `src/renderer/base/thread.hpp` (+1 -0) 📝 `src/renderer/inc/IRenderThread.hpp` (+1 -0) </details> ### 📄 Description ## Summary of the Pull Request Renderer: Add support for backoff and auto-disable on failed retry This commit introduces a backoff (150ms * number of tries) to the renderer's retry logic (introduced in #2830). It also changes the FAIL_FAST to a less globally-harmful render thread disable, so that we stop blowing up any application hosting a terminal when the graphics driver goes away. In addition, it adds a callback that a Renderer consumer can use to determine when the renderer _has_ failed, and a public method to kick it back into life. Fixes #5340. This PR also wires up TermControl so that it shows some UI when the renderer tastes clay. ![image](https://user-images.githubusercontent.com/14316954/79266118-f073f680-7e4b-11ea-8b96-5588a13aff3b.png) ![image](https://user-images.githubusercontent.com/14316954/79266125-f36ee700-7e4b-11ea-9314-4280e9149461.png) ## PR Checklist * [x] Closes #5340 * [x] cla * [ ] Tests added/passed * [ ] Requires documentation to be updated * [x] I've discussed this with core contributors already. ## Validation Steps Performed I tested this by dropping the number of retries to 1 and forcing a TDR while doing `wsl cmatrix -u0`. It picked up exactly where it left off. As a bonus, you can actually still type into the terminal when it's graphically suspended (and `exit` still works.). The block is _entirely graphical_. --- <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:15:03 +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#26267
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?