Skip to content
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

Jump to bottom

HostVisual threading #3567

Merged
merged 3 commits into from
Oct 7, 2020
Merged

HostVisual threading #3567

merged 3 commits into from
Oct 7, 2020

Conversation

SamBent
Copy link
Contributor

@SamBent SamBent commented Sep 24, 2020 •
edited
Loading

Addresses #3100
This is a port of a servicing fix in .NET 4.7-4.8

Issue: HostVisual can disconnect from its rendering channel on the wrong thread. This can result in corruption that can crash the render thread, usually in some unrelated activity many minutes (or hours) later.

Discussion:
HostVisual sometimes adds commands to the graphics channel on the wrong thread. And sometimes this leaves the channel in a corrupt state, where the primary handle table releases a slot but the secondary handle table doesn't release the corresponding slot. This is a time-bomb - the next time the primary table allocates the slot, the secondary table allocation will fail, which will crash the app at the next SyncFlush. (It could take minutes or hours for this to happen.)

The fix is for HostVisual to marshal the offending work back to the right thread. I'm also adding checks to detect wrong-thread channel activity, available in private builds.

@SamBent SamBent requested a review from a team as a code owner September 24, 2020 01:02
@ghost ghost added the PR metadata: Label to tag PRs, to facilitate with triage label Sep 24, 2020
lindexi
lindexi reviewed Sep 26, 2020
View reviewed changes
src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/HostVisual.cs
if (channelDispatcher != null)
{
DispatcherOperation op = channelDispatcher.BeginInvoke(
DispatcherPriority.Normal,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we use Render priority? I think it's a rendering task.

@SamBent SamBent changed the base branch from release/5.0-rc2 to release/5.0 October 7, 2020 00:27
@SamBent SamBent merged commit cf8bd1f into dotnet:release/5.0 Oct 7, 2020
@SamBent SamBent deleted the HostVisualThreading branch October 7, 2020 21:56
dotnet-maestro bot added a commit that referenced this pull request Oct 16, 2020
@dotnet-maestro
[master] Update dependencies from dotnet/winforms (#3647)
bc968b3 
[master] Update dependencies from dotnet/winforms
- Coherency Updates:
  - Microsoft.Win32.Registry: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - System.CodeDom: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - System.Configuration.ConfigurationManager: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - System.Diagnostics.EventLog: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - System.DirectoryServices: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - System.Drawing.Common: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - System.Reflection.MetadataLoadContext: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - System.Security.AccessControl: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - System.Security.Cryptography.Xml: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - System.Security.Permissions: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - System.Security.Principal.Windows: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - System.Windows.Extensions: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.Platforms: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - System.IO.Packaging: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.ILDAsm: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.ILAsm: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - System.Resources.Extensions: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.App.Internal: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.App.Ref: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-alpha.1.20428.2 to 6.0.0-alpha.1.20515.8 (parent: Microsoft.Private.Winforms)

 - .NET Core WPF Build error on custom BaseIntermediateOutputPath #1718 (#3120)

* Use more robust relative path calculation in markup code generation

 - Do not reflow lines after measure

 - disconnect HostVisual on its own thread

 - Fix three scrolling hangs

 - remove useless Assert

 - handle re-entrant request to close ToolTip

 - Move StackTrace to error branch

 - FixedPage SOM bugs

 - Don't add null item peers

 - Use correct lock object for predefined packages

 - repair bad copy/paste

 - fix build break

 - remove AppContext switch

 - DataGrid.Copy: fail silently if clipboard is locked

 - update_intellisense_artifacts

 - Remove or replace Policheck violations in code comments (#3606)

 - Merge pull request #3542 from dotnet/rc2-askmode-BaseIntermediateOutputPath

Ask-Mode: [release/5.0-rc2] Custom intermediate output paths shouldn't break markup compilation

 - Merge pull request #3564 from SamBent/VSPFreeze

Vsp freeze

 - Merge pull request #3565 from SamBent/AutomationPeerNull

Avoid null item AutomationPeers

 - Merge pull request #3566 from SamBent/TextReflow

Avoid reflow of shaped text

 - Merge pull request #3567 from SamBent/HostVisualThreading

HostVisual threading

 - Merge pull request #3568 from SamBent/PopupReentrancy

Reentrancy when closing ToolTip

 - Merge pull request #3570 from SamBent/ClearTypeAntiAliasing

ClearType anti-aliasing

 - Merge pull request #3574 from SamBent/NoisyStackTrace

Move StackTrace to error branch

 - Merge pull request #3575 from SamBent/FixedPageOverlap

FixedPage SOM bugs

 - Merge pull request #3576 from SamBent/LockedClipboard

DataGrid.Copy: fail silently if clipboard is locked

 - Merge pull request #3577 from SamBent/PredefinedPackageSynch

App resource threading issue

 - Revert "Merge pull request #3542 from dotnet/rc2-askmode-BaseIntermediateOutputPath"

This reverts commit 3d4e91c, reversing
changes made to ab840c4.

 - Merge branch 'release/5.0' of https://github.com/dotnet/wpf into release/5.0

 - update intellisense version

 - missed a version

 - 1228498 [ wpf ][ PoliCheck ] - Defect : Term "nuked"

 - Merge pull request #3637 from dotnet/revertPath

[release/5.0] Revert path change to markup compiler

 - Merge pull request #3642 from dotnet/policheck2

1228498 [ wpf ][ PoliCheck ] - Defect : Term "nuked"

 - Update arcade

 - Merge remote-tracking branch 'upstream/release/5.0' into darc-master-f9327a78-0358-4132-8625-923a71a6b121

 - Update wpf-int dependencies

 - Replace null comparisons on non-nullable types that now cause compilation errors, due to the .NET SDK update.

 - PR feedback

 - PR feedback

 - Merge pull request #3640 from AdamYoblick/release/5.0

Update intellisense version

 - Merge remote-tracking branch 'upstream/release/5.0' into darc-master-f9327a78-0358-4132-8625-923a71a6b121

 - Merge branch 'darc-master-f9327a78-0358-4132-8625-923a71a6b121' of https://github.com/dotnet/wpf into darc-master-f9327a78-0358-4132-8625-923a71a6b121

 - Suppress obsolete API warnings. These must be fixed for 6.0.0.

 - Merge pull request #3659 from dotnet/fixdarcupdate

Temporarily suppress obsolete API errors to get WPF master building

 - Merge branch 'master' into darc-master-f9327a78-0358-4132-8625-923a71a6b121
@AndreasBreuninger AndreasBreuninger mentioned this pull request Oct 29, 2020
Open
@ghost ghost locked as resolved and limited conversation to collaborators Apr 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lindexi lindexi lindexi left review comments

@fabiant3 fabiant3 fabiant3 approved these changes

@vatsan-madhavan vatsan-madhavan vatsan-madhavan approved these changes

@ryalanms ryalanms Awaiting requested review from ryalanms

Assignees
No one assigned
Labels
PR metadata: Label to tag PRs, to facilitate with triage
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@SamBent @lindexi @vatsan-madhavan @fabiant3