fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-06-09 05:08:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[cairo-pattern] Try to repaint the evicted surface from the solid surface cache.

Browse source 
Behdad Esfahbod complained that commit
8457374c9c overwhelmed the function with
added complexity and arbitrary limited a backend to one-quarter of the
cache. The elegant solution, he outlined, was to look at the surface that
would be evicted and if possible repaint it, instead of creating a
replacement. This not only simplifies the code, reduces the number of
checks performed to find a match (or victim) and allows the cache to be
naturally shared between the various backends.
This commit is contained in:
Chris Wilson 2008-05-08 20:48:19 +01:00
parent ea79af728c
commit 40e1aa60f2
1 changed files with 51 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
src/cairo-pattern.c
View file

@ -1403,8 +1403,6 @@ _cairo_pattern_acquire_surface_for_solid (cairo_solid_pattern_t *pattern,
cairo_surface_t *surface;
cairo_status_t status;
char is_similar[MAX_SURFACE_CACHE_SIZE];
int count;
CAIRO_MUTEX_LOCK (_cairo_pattern_solid_surface_cache_lock);
@ -1421,77 +1419,68 @@ _cairo_pattern_acquire_surface_for_solid (cairo_solid_pattern_t *pattern,
goto DONE;
}
count = 0;
for (i = 0 ; i < solid_surface_cache.size; i++) {
const struct _cairo_pattern_solid_surface_cache *cache;
if (_cairo_pattern_solid_surface_matches (&solid_surface_cache.cache[i],
pattern,
dst))
{
status = _cairo_surface_reset (solid_surface_cache.cache[i].surface);
if (status)
goto UNLOCK;
cache = &solid_surface_cache.cache[i];
if (CAIRO_REFERENCE_COUNT_GET_VALUE (&cache->surface->ref_count) != 1)
continue;
if (! _cairo_surface_is_similar (cache->surface, dst, pattern->content))
continue;
is_similar[count++] = i;
if (! _cairo_color_equal (&cache->color, &pattern->color))
continue;
status = _cairo_surface_reset (cache->surface);
if (status)
goto UNLOCK;
goto DONE;
goto DONE;
}
}
/* Choose a surface to re-use (but only if we have an ample supply) */
if (i == MAX_SURFACE_CACHE_SIZE && count > MAX_SURFACE_CACHE_SIZE / 4) {
i = is_similar[rand () % count];
/* Choose a surface to repaint/evict */
surface = NULL;
if (solid_surface_cache.size == MAX_SURFACE_CACHE_SIZE) {
i = rand () % MAX_SURFACE_CACHE_SIZE;
surface = solid_surface_cache.cache[i].surface;
status = _cairo_surface_reset (surface);
if (status)
if (CAIRO_REFERENCE_COUNT_GET_VALUE (&surface->ref_count) == 1 &&
_cairo_surface_is_similar (surface, dst, pattern->content))
{
status = _cairo_surface_reset (surface);
if (status)
goto UNLOCK;
status = _cairo_surface_paint (surface,
CAIRO_OPERATOR_SOURCE,
&pattern->base);
if (status)
goto UNLOCK;
} else {
/* Unable to reuse, evict */
cairo_surface_destroy (surface);
surface = NULL;
}
}
if (surface == NULL) {
/* Not cached, need to create new */
surface = _cairo_surface_create_similar_solid (dst,
pattern->content,
1, 1,
&pattern->color,
&pattern->base);
if (surface->status) {
status = surface->status;
goto UNLOCK;
}
status = _cairo_surface_paint (surface,
CAIRO_OPERATOR_SOURCE,
&pattern->base);
if (status)
goto UNLOCK;
goto SAVE;
if (! _cairo_surface_is_similar (surface, dst, pattern->content)) {
/* in the rare event of a substitute surface being returned (e.g.
* malloc failure) don't cache the fallback surface */
*out = surface;
goto NOCACHE;
}
}
/* Not cached, need to create new */
surface = _cairo_surface_create_similar_solid (dst,
pattern->content,
1, 1,
&pattern->color,
&pattern->base);
if (surface->status) {
status = surface->status;
goto UNLOCK;
}
/* Increment after recursion by _cairo_surface_create_similar_solid() */
if (solid_surface_cache.size < MAX_SURFACE_CACHE_SIZE)
i = solid_surface_cache.size++;
if (! _cairo_surface_is_similar (surface, dst, pattern->content)) {
/* in the rare event of a substitute surface being returned (e.g.
* malloc failure) don't cache the fallback surface */
*out = surface;
goto NOCACHE;
}
/* Cache new */
if (solid_surface_cache.size < MAX_SURFACE_CACHE_SIZE) {
solid_surface_cache.size++;
} else {
i = rand () % MAX_SURFACE_CACHE_SIZE;
/* Evict old */
cairo_surface_destroy (solid_surface_cache.cache[i].surface);
}
SAVE:
solid_surface_cache.cache[i].color = pattern->color;
solid_surface_cache.cache[i].surface = surface;