-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Fix ServerCompositionSimplePen memory leak #19958
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.
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
base: master
Are you sure you want to change the base?
Conversation
|
You can test this PR using the following package version. |
|
Please read the following Contributor License Agreement (CLA). If you agree with the CLA, please reply with the following: Contributor License AgreementContribution License AgreementThis Contribution License Agreement ( “Agreement” ) is agreed to by the party signing below ( “You” ), 1. Definitions. “Code” means the computer software code, whether in human-readable or machine-executable form, “Project” means any of the projects owned or managed by AvaloniaUI OÜ and offered under a license “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any “Submission” means the Code and any other copyrightable material Submitted by You, including any 2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any 3. Originality of Work. You represent that each of Your Submissions is entirely Your 4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else 5. Licenses. a. Copyright License. You grant AvaloniaUI OÜ, and those who receive the Submission directly b. Patent License. You grant AvaloniaUI OÜ, and those who receive the Submission directly or c. Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement. 6. Representations and Warranties. You represent that You are legally entitled to grant the above 7. Notice to AvaloniaUI OÜ. You agree to notify AvaloniaUI OÜ in writing of any facts or 8. Information about Submissions. You agree that contributions to Projects and information about 9. Governing Law/Jurisdiction. This Agreement is governed by the laws of the Republic of Estonia, and 10. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and AvaloniaUI OÜ dedicates this Contribution License Agreement to the public domain according to the Creative Commons CC0 1. |
| // Dispose of the brush resource, this will remove the pen from the brush observers. | ||
| // This was causing the pen to be retained in memory by long lived brush resources (e.g. those defined in | ||
| // the theme or app resources), hence was causing memory leaks; see Issue #16451 | ||
| SetValue(ref _brush, null!); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The property change will cause the pen to be queued for invalidation, which isn't needed since the object is being disposed. I think a better fix would be to call RemoveObserversFromProperty(ref _brush).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that makes sense, I'll make the change.
SetValue nulls the brush, so I'll set the brush to null, although it should not be necessary if the pen get GCed.
|
You can test this PR using the following package version. |
What does the pull request do?
Bug fix for the
ServerCompositionSimplePenmemory leakWhat is the current behavior?
ServerCompositionSimplePenobjects are leaking as when the compositor createsServerCompositionSimplePenresources that use shared brushes defined in the Theme or Window resources.What is the updated/expected behavior with this PR?
Fixes the memory leak.
How was the solution implemented (if it's not obvious)?
The
ServerCompositionSimplePenis being held in memory because it it is added to theServerCompositionSimpleBrushlist of observers but is never removed when the pen is disposed.If the associated brush is long lived; i.e. a static or dynamic resource created in the theme or main window, the number of
ServerCompositionSimplePenin it's list of observers increases every time a pen is created for that brush.Added a Dispose override to remove the pen from the brush observers.
Checklist
Not sure how to add a unit test for this as it doesn't appear to be possible to get a count of live objects of a class from GC.
Breaking changes
None
Obsoletions / Deprecations
None
Fixed issues
Fixes #16451