diff options
| author | Akira TAGOH <akira@tagoh.org> | 2023-01-25 11:50:29 +0900 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2023-01-25 14:36:30 +0900 |
| commit | 92f093a4c493dc93958ef750a6d66ad9b1ad68d4 (patch) | |
| tree | 9ff3163bf1facebe5894221e1a20f93d34c3f087 | |
| parent | da1e3f35e61597fbf58c9c550ceba6d44abb1563 (diff) | |
| download | fontconfig-92f093a4c493dc93958ef750a6d66ad9b1ad68d4.tar.gz | |
Report more detailed logs instead of assertion.
Getting backtraces against this assertion isn't useful at all.
Fontconfig isn't capable to report who really have a reference
of caches though, this report may be better than assertion.
So we can try analysis tools then.
And report it only when running with FC_DEBUG=16.
| -rw-r--r-- | src/fccache.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/fccache.c b/src/fccache.c index 4a6a752..cebbb81 100644 --- a/src/fccache.c +++ b/src/fccache.c @@ -287,7 +287,7 @@ FcDirCacheUnlink (const FcChar8 *dir, FcConfig *config) ret = FcFalse; goto bail; } - + while ((cache_dir = FcStrListNext (list))) { if (sysroot) @@ -381,7 +381,7 @@ FcDirCacheProcess (FcConfig *config, const FcChar8 *dir, list = FcStrListCreate (config->cacheDirs); if (!list) return FcFalse; - + while ((cache_dir = FcStrListNext (list))) { FcChar8 *cache_hashed; @@ -794,20 +794,17 @@ FcCacheFini (void) { int i; - for (i = 0; i < FC_CACHE_MAX_LEVEL; i++) + if (FcDebug() & FC_DBG_CACHE) { - if (FcDebug() & FC_DBG_CACHE) + for (i = 0; i < FC_CACHE_MAX_LEVEL; i++) { if (fcCacheChains[i] != NULL) { FcCacheSkip *s = fcCacheChains[i]; - printf("Fontconfig error: not freed %p (dir: %s, refcount %" FC_ATOMIC_INT_FORMAT ")\n", s->cache, FcCacheDir(s->cache), s->ref.count); + fprintf(stderr, "Fontconfig error: not freed %p (dir: %s, refcount %" FC_ATOMIC_INT_FORMAT ")\n", s->cache, FcCacheDir(s->cache), s->ref.count); } } - else - assert (fcCacheChains[i] == NULL); } - assert (fcCacheMaxLevel == 0); free_lock (); } @@ -1019,7 +1016,7 @@ FcDirCacheMapFd (FcConfig *config, int fd, struct stat *fd_stat, struct stat *di /* Mark allocated caches so they're freed rather than unmapped */ if (allocated) cache->magic = FC_CACHE_MAGIC_ALLOC; - + return cache; } @@ -1711,7 +1708,7 @@ FcCacheCopySet args1(const FcCache *c) for (i = 0; i < old->nfont; i++) { FcPattern *font = FcFontSetFont (old, i); - + FcPatternReference (font); if (!FcFontSetAdd (new, font)) { |