diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-12-25 15:01:17 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-12-25 15:01:17 +0000 |
| commit | a042d311c8e6f5fbb82c52a24a47831674dff9e7 (patch) | |
| tree | 7039f0cf449f6e3b098b09e7c949cbba3b8ec251 /pango/pangofc-fontmap.c | |
| parent | 07c91f9b2f9f3979939d6d7adcd22968b9b5b33e (diff) | |
| parent | 8fa7b37a31422c4334c6e93213ca5816644e8aa4 (diff) | |
| download | pango-a042d311c8e6f5fbb82c52a24a47831674dff9e7.tar.gz | |
Merge branch 'matthiasc/for-main' into 'main'
tracing: Fix the defines
Closes #648
See merge request GNOME/pango!565
Diffstat (limited to 'pango/pangofc-fontmap.c')
| -rw-r--r-- | pango/pangofc-fontmap.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index d198df45..5b0c4999 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -835,7 +835,9 @@ match_in_thread (gpointer task_data) ThreadData *td = task_data; FcResult result; FcPattern *match; - gint64 before = PANGO_TRACE_CURRENT_TIME; + gint64 before G_GNUC_UNUSED; + + before = PANGO_TRACE_CURRENT_TIME; match = FcFontSetMatch (td->config, &td->fonts, 1, @@ -860,7 +862,9 @@ sort_in_thread (gpointer task_data) ThreadData *td = task_data; FcResult result; FcFontSet *fontset; - gint64 before = PANGO_TRACE_CURRENT_TIME; + gint64 before G_GNUC_UNUSED; + + before = PANGO_TRACE_CURRENT_TIME; fontset = FcFontSetSort (td->config, &td->fonts, 1, @@ -1023,9 +1027,11 @@ pango_fc_patterns_get_font_pattern (PangoFcPatterns *pats, int i, gboolean *prep if (i == 0) { - gint64 before = PANGO_TRACE_CURRENT_TIME; + gint64 before G_GNUC_UNUSED; gboolean waited = FALSE; + before = PANGO_TRACE_CURRENT_TIME; + g_mutex_lock (&pats->mutex); while (!pats->match && !pats->fontset) @@ -1050,9 +1056,11 @@ pango_fc_patterns_get_font_pattern (PangoFcPatterns *pats, int i, gboolean *prep } else { - gint64 before = PANGO_TRACE_CURRENT_TIME; + gint64 before G_GNUC_UNUSED; gboolean waited = FALSE; + before = PANGO_TRACE_CURRENT_TIME; + g_mutex_lock (&pats->mutex); while (!pats->fontset) @@ -1354,7 +1362,9 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (PangoFcFontMap, pango_fc_font_map, PANGO_TYPE_ static gpointer init_in_thread (gpointer task_data) { - gint64 before = PANGO_TRACE_CURRENT_TIME; + gint64 before G_GNUC_UNUSED; + + before = PANGO_TRACE_CURRENT_TIME; FcInit (); @@ -1388,9 +1398,11 @@ start_init_in_thread (PangoFcFontMap *fcfontmap) static void wait_for_fc_init (void) { - gint64 before = PANGO_TRACE_CURRENT_TIME; + gint64 before G_GNUC_UNUSED; gboolean waited = FALSE; + before = PANGO_TRACE_CURRENT_TIME; + g_mutex_lock (&fc_init_mutex); while (fc_initialized < DEFAULT_CONFIG_INITIALIZED) { |