Make cache reference counting more efficient.
Eliminate need to reference cache object once per cached font, instead just count the number of fonts used from the cache and bump the reference count once by that amount. I think this makes this refernece technique efficient enough for use.
This commit is contained in:
parent
9e612141df
commit
17389539a0
|
@ -476,6 +476,15 @@ FcDirCacheMapFd (int fd, struct stat *fd_stat)
|
|||
return cache;
|
||||
}
|
||||
|
||||
void
|
||||
FcDirCacheReference (FcCache *cache, int nref)
|
||||
{
|
||||
FcCacheSkip *skip = FcCacheFindByAddr (cache);
|
||||
|
||||
if (skip)
|
||||
skip->ref += nref;
|
||||
}
|
||||
|
||||
void
|
||||
FcDirCacheUnload (FcCache *cache)
|
||||
{
|
||||
|
|
|
@ -239,6 +239,8 @@ FcConfigAddCache (FcConfig *config, FcCache *cache)
|
|||
fs = FcCacheSet (cache);
|
||||
if (fs)
|
||||
{
|
||||
int nref = 0;
|
||||
|
||||
for (i = 0; i < fs->nfont; i++)
|
||||
{
|
||||
FcPattern *font = FcFontSetFont (fs, i);
|
||||
|
@ -260,9 +262,10 @@ FcConfigAddCache (FcConfig *config, FcCache *cache)
|
|||
if (!FcConfigAcceptFont (config, font))
|
||||
continue;
|
||||
|
||||
FcPatternReference (font);
|
||||
nref++;
|
||||
FcFontSetAdd (config->fonts[FcSetSystem], font);
|
||||
}
|
||||
FcDirCacheReference (cache, nref);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -513,6 +513,9 @@ FcCacheObjectDereference (void *object);
|
|||
FcPrivate void
|
||||
FcCacheFini (void);
|
||||
|
||||
void
|
||||
FcDirCacheReference (FcCache *cache, int nref);
|
||||
|
||||
/* fccfg.c */
|
||||
|
||||
FcPrivate FcBool
|
||||
|
|
Loading…
Reference in New Issue