diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-11-25 05:09:39 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-11-25 05:09:39 +0000 |
| commit | 7d36abc19331579d1a9d0df8b2c41a9bf57dd669 (patch) | |
| tree | 89d02ef014934648f8a9ee51a26bdeb841637eef | |
| parent | e20a876aae772e4a15a53ebb457e3b2b64c705c5 (diff) | |
| download | pango-7d36abc19331579d1a9d0df8b2c41a9bf57dd669.tar.gz | |
Make renderer-cache really thread-safe this time. Last try was not quite
2006-11-25 Behdad Esfahbod <behdad@gnome.org>
* pango/pangocairo-render.c (acquire_renderer), (release_renderer),
(_pango_cairo_do_glyph_string), (_pango_cairo_do_layout_line),
(_pango_cairo_do_layout): Make renderer-cache really thread-safe this
time. Last try was not quite thread-safe theoretically, because
pointer assignments are not necessarily atomic on some archs. Anyway,
this one should do it.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | pango/pangocairo-render.c | 28 |
2 files changed, 27 insertions, 10 deletions
@@ -1,3 +1,12 @@ +2006-11-25 Behdad Esfahbod <behdad@gnome.org> + + * pango/pangocairo-render.c (acquire_renderer), (release_renderer), + (_pango_cairo_do_glyph_string), (_pango_cairo_do_layout_line), + (_pango_cairo_do_layout): Make renderer-cache really thread-safe this + time. Last try was not quite thread-safe theoretically, because + pointer assignments are not necessarily atomic on some archs. Anyway, + this one should do it. + 2006-11-22 Behdad Esfahbod <behdad@gnome.org> Bug 377975 – bug in _pango_glyph_item_iter_next_cluster diff --git a/pango/pangocairo-render.c b/pango/pangocairo-render.c index dd4d6cf3..f39df3f5 100644 --- a/pango/pangocairo-render.c +++ b/pango/pangocairo-render.c @@ -398,7 +398,7 @@ static PangoCairoRenderer *cached_renderer = NULL; static GStaticMutex cached_renderer_mutex = G_STATIC_MUTEX_INIT; static PangoCairoRenderer * -acquire_renderer (void) +acquire_renderer (gboolean *free_renderer) { PangoCairoRenderer *renderer; @@ -410,16 +410,21 @@ acquire_renderer (void) cached_renderer = g_object_new (PANGO_TYPE_CAIRO_RENDERER, NULL); renderer = cached_renderer; + *free_renderer = FALSE; } else - renderer = g_object_new (PANGO_TYPE_CAIRO_RENDERER, NULL); + { + renderer = g_object_new (PANGO_TYPE_CAIRO_RENDERER, NULL); + *free_renderer = TRUE; + } return renderer; } -release_renderer (PangoCairoRenderer *renderer) +static void +release_renderer (PangoCairoRenderer *renderer, gboolean free_renderer) { - if (G_LIKELY (renderer == cached_renderer)) + if (G_LIKELY (!free_renderer)) { renderer->cr = NULL; renderer->do_path = FALSE; @@ -442,7 +447,8 @@ _pango_cairo_do_glyph_string (cairo_t *cr, PangoGlyphString *glyphs, gboolean do_path) { - PangoCairoRenderer *crenderer = acquire_renderer (); + gboolean free_renderer; + PangoCairoRenderer *crenderer = acquire_renderer (&free_renderer); PangoRenderer *renderer = (PangoRenderer *) crenderer; crenderer->cr = cr; @@ -470,7 +476,7 @@ _pango_cairo_do_glyph_string (cairo_t *cr, pango_renderer_deactivate (renderer); } - release_renderer (crenderer); + release_renderer (crenderer, free_renderer); } static void @@ -478,7 +484,8 @@ _pango_cairo_do_layout_line (cairo_t *cr, PangoLayoutLine *line, gboolean do_path) { - PangoCairoRenderer *crenderer = acquire_renderer (); + gboolean free_renderer; + PangoCairoRenderer *crenderer = acquire_renderer (&free_renderer); PangoRenderer *renderer = (PangoRenderer *) crenderer; crenderer->cr = cr; @@ -487,7 +494,7 @@ _pango_cairo_do_layout_line (cairo_t *cr, pango_renderer_draw_layout_line (renderer, line, 0, 0); - release_renderer (crenderer); + release_renderer (crenderer, free_renderer); } static void @@ -495,7 +502,8 @@ _pango_cairo_do_layout (cairo_t *cr, PangoLayout *layout, gboolean do_path) { - PangoCairoRenderer *crenderer = acquire_renderer (); + gboolean free_renderer; + PangoCairoRenderer *crenderer = acquire_renderer (&free_renderer); PangoRenderer *renderer = (PangoRenderer *) crenderer; crenderer->cr = cr; @@ -504,7 +512,7 @@ _pango_cairo_do_layout (cairo_t *cr, pango_renderer_draw_layout (renderer, layout, 0, 0); - release_renderer (crenderer); + release_renderer (crenderer, free_renderer); } static void |