Fix pango fontmap threading issue. #601
Merged
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.
Since pango v1.32.6
pango_cairo_font_map_get_default
returns a per threadfontmap
. But since we're allocating this statically on the first call torrd_init
,if we then try to access it again via another thread glib will get stuck in an infinte assertion loop.
Instead use
pango_cairo_font_map_new()
when creating thefontmap
. This will not create a per thread version and glib will be happy.Also added some extra locking whenever using the
im->layout
pango structure that uses thefontmap
internally as a precaution.This fixes #600