[Text] Make sure TryGetGlyphTypeface does not fail for concurrent access#21269
Merged
MrJul merged 8 commits intoMay 15, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This WIP PR aims to prevent FontManager.TryGetGlyphTypeface failures under concurrent access by making font collection retrieval/creation more concurrency-safe, and adds a unit test that exercises concurrent embedded-font lookups.
Changes:
- Update
FontManager.TryGetFontCollectionto use_fontCollections.GetOrAdd(...)when retrieving/creating system and embedded font collections. - Add a new unit test that repeatedly forces embedded font collection recreation and performs concurrent
TryGetGlyphTypefacecalls.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
src/Avalonia.Base/Media/FontManager.cs |
Switches font collection caching logic to ConcurrentDictionary.GetOrAdd for concurrent access. |
tests/Avalonia.Base.UnitTests/Media/FontManagerTests.cs |
Adds a concurrency regression test for embedded font lookups. |
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
MrJul
added
bug
area-textprocessing
backport-candidate-12.0.x
…Avalonia into fixes/tryGetGlyphTypefaceRace
Gillibald
changed the title
|
You can test this PR using the following package version. |
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
|
You can test this PR using the following package version. |
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
MrJul
pushed a commit
to MrJul/Avalonia
that referenced
this pull request
May 28, 2026
…ess (AvaloniaUI#21269) * Make sure TryGetGlyphTypeface does not fail for concurrent access * Update tests/Avalonia.Base.UnitTests/Media/FontManagerTests.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update gitignore * Make TryGetFontCollection more robust and add unit tests * Introdcue GetOrCreateFontCollection helper for safe disposal of losing instances * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
MrJul
added
backported-12.0.x
and removed
backport-candidate-12.0.x
This file contains hidden or 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
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.
What does the pull request do?
Prevent FontManager.TryGetGlyphTypeface failures under concurrent access by making font collection retrieval/creation more concurrency-safe, and add unit tests that exercise concurrent embedded-font lookups.
What is the current behavior?
What is the updated/expected behavior with this PR?
How was the solution implemented (if it's not obvious)?
Checklist
Breaking changes
Obsoletions / Deprecations
Fixed issues