Rewrite global cache handling code in fontconfig to eliminate per-file
syscalls
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 1939e46..2a87aa7 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -191,7 +191,7 @@
typedef struct _FcConfig FcConfig;
-typedef struct _FcFileCache FcFileCache;
+typedef struct _FcGlobalCache FcFileCache;
typedef struct _FcBlanks FcBlanks;
@@ -365,9 +365,6 @@
FcBool
FcDirSave (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir);
-FcBool
-FcDirCacheValid (const FcChar8 *dir);
-
/* fcfreetype.c */
FcPattern *
FcFreeTypeQuery (const FcChar8 *file, int id, FcBlanks *blanks, int *count);
diff --git a/src/fccache.c b/src/fccache.c
index 960beb4..e5e9d14 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -24,78 +24,10 @@
#include "fcint.h"
-static unsigned int
-FcFileCacheHash (const FcChar8 *string)
-{
- unsigned int h = 0;
- FcChar8 c;
+#define FC_DBG_CACHE_REF 1024
- while ((c = *string++))
- h = (h << 1) ^ c;
- return h;
-}
-
-FcChar8 *
-FcFileCacheFind (FcFileCache *cache,
- const FcChar8 *file,
- int id,
- int *count)
-{
- unsigned int hash;
- const FcChar8 *match;
- FcFileCacheEnt *c, *name;
- int maxid;
- struct stat statb;
-
- match = file;
-
- hash = FcFileCacheHash (match);
- name = 0;
- maxid = -1;
- for (c = cache->ents[hash % FC_FILE_CACHE_HASH_SIZE]; c; c = c->next)
- {
- if (c->hash == hash && !strcmp ((const char *) match, (const char *) c->file))
- {
- if (c->id > maxid)
- maxid = c->id;
- if (c->id == id)
- {
- if (stat ((char *) file, &statb) < 0)
- {
- if (FcDebug () & FC_DBG_CACHE)
- printf (" file missing\n");
- return 0;
- }
- if (statb.st_mtime != c->time)
- {
- if (FcDebug () & FC_DBG_CACHE)
- printf (" timestamp mismatch (was %d is %d)\n",
- (int) c->time, (int) statb.st_mtime);
- return 0;
- }
- if (!c->referenced)
- {
- cache->referenced++;
- c->referenced = FcTrue;
- }
- name = c;
- }
- }
- }
- if (!name)
- return 0;
- *count = maxid + 1;
- return name->name;
-}
-
-/*
- * Cache file syntax is quite simple:
- *
- * "file_name" id time "font_name" \n
- */
-
static FcChar8 *
-FcFileCacheReadString (FILE *f, FcChar8 *dest, int len)
+FcCacheReadString (FILE *f, FcChar8 *dest, int len)
{
int c;
FcBool escape;
@@ -150,7 +82,7 @@
}
static FcBool
-FcFileCacheReadUlong (FILE *f, unsigned long *dest)
+FcCacheReadUlong (FILE *f, unsigned long *dest)
{
unsigned long t;
int c;
@@ -177,187 +109,34 @@
}
static FcBool
-FcFileCacheReadInt (FILE *f, int *dest)
+FcCacheReadInt (FILE *f, int *dest)
{
unsigned long t;
FcBool ret;
- ret = FcFileCacheReadUlong (f, &t);
+ ret = FcCacheReadUlong (f, &t);
if (ret)
*dest = (int) t;
return ret;
}
static FcBool
-FcFileCacheReadTime (FILE *f, time_t *dest)
+FcCacheReadTime (FILE *f, time_t *dest)
{
unsigned long t;
FcBool ret;
- ret = FcFileCacheReadUlong (f, &t);
+ ret = FcCacheReadUlong (f, &t);
if (ret)
*dest = (time_t) t;
return ret;
}
static FcBool
-FcFileCacheAdd (FcFileCache *cache,
- const FcChar8 *file,
- int id,
- time_t time,
- const FcChar8 *name,
- FcBool replace)
+FcCacheWriteChars (FILE *f, const FcChar8 *chars)
{
- FcFileCacheEnt *c;
- FcFileCacheEnt **prev, *old;
- unsigned int hash;
-
- if (FcDebug () & FC_DBG_CACHE)
- {
- printf ("%s face %s/%d as %s\n", replace ? "Replace" : "Add",
- file, id, name);
- }
- hash = FcFileCacheHash (file);
- for (prev = &cache->ents[hash % FC_FILE_CACHE_HASH_SIZE];
- (old = *prev);
- prev = &(*prev)->next)
- {
- if (old->hash == hash && old->id == id && !strcmp ((const char *) old->file,
- (const char *) file))
- break;
- }
- if (*prev)
- {
- if (!replace)
- return FcFalse;
-
- old = *prev;
- if (old->referenced)
- cache->referenced--;
- *prev = old->next;
- free (old);
- cache->entries--;
- }
-
- c = malloc (sizeof (FcFileCacheEnt) +
- strlen ((char *) file) + 1 +
- strlen ((char *) name) + 1);
- if (!c)
- return FcFalse;
- c->next = *prev;
- *prev = c;
- c->hash = hash;
- c->file = (FcChar8 *) (c + 1);
- c->id = id;
- c->name = c->file + strlen ((char *) file) + 1;
- strcpy ((char *) c->file, (const char *) file);
- c->time = time;
- c->referenced = replace;
- strcpy ((char *) c->name, (const char *) name);
- cache->entries++;
- return FcTrue;
-}
-
-FcFileCache *
-FcFileCacheCreate (void)
-{
- FcFileCache *cache;
- int h;
-
- cache = malloc (sizeof (FcFileCache));
- if (!cache)
- return 0;
- for (h = 0; h < FC_FILE_CACHE_HASH_SIZE; h++)
- cache->ents[h] = 0;
- cache->entries = 0;
- cache->referenced = 0;
- cache->updated = FcFalse;
- return cache;
-}
-
-void
-FcFileCacheDestroy (FcFileCache *cache)
-{
- FcFileCacheEnt *c, *next;
- int h;
-
- for (h = 0; h < FC_FILE_CACHE_HASH_SIZE; h++)
- {
- for (c = cache->ents[h]; c; c = next)
- {
- next = c->next;
- free (c);
- }
- }
- free (cache);
-}
-
-void
-FcFileCacheLoad (FcFileCache *cache,
- const FcChar8 *cache_file)
-{
- FILE *f;
- FcChar8 file_buf[8192], *file;
- int id;
- time_t time;
- FcChar8 name_buf[8192], *name;
-
- f = fopen ((char *) cache_file, "r");
- if (!f)
- return;
-
- cache->updated = FcFalse;
- file = 0;
- name = 0;
- while ((file = FcFileCacheReadString (f, file_buf, sizeof (file_buf))) &&
- FcFileCacheReadInt (f, &id) &&
- FcFileCacheReadTime (f, &time) &&
- (name = FcFileCacheReadString (f, name_buf, sizeof (name_buf))))
- {
- (void) FcFileCacheAdd (cache, file, id, time, name, FcFalse);
- if (file != file_buf)
- free (file);
- if (name != name_buf)
- free (name);
- file = 0;
- name = 0;
- }
- if (file && file != file_buf)
- free (file);
- if (name && name != name_buf)
- free (name);
- fclose (f);
-}
-
-FcBool
-FcFileCacheUpdate (FcFileCache *cache,
- const FcChar8 *file,
- int id,
- const FcChar8 *name)
-{
- const FcChar8 *match;
- struct stat statb;
- FcBool ret;
-
- match = file;
-
- if (stat ((char *) file, &statb) < 0)
- return FcFalse;
- ret = FcFileCacheAdd (cache, match, id,
- statb.st_mtime, name, FcTrue);
- if (ret)
- cache->updated = FcTrue;
- return ret;
-}
-
-static FcBool
-FcFileCacheWriteString (FILE *f, const FcChar8 *string)
-{
- char c;
-
- if (putc ('"', f) == EOF)
- return FcFalse;
- while ((c = *string++))
+ FcChar8 c;
+ while ((c = *chars++))
{
switch (c) {
case '"':
@@ -370,13 +149,42 @@
return FcFalse;
}
}
+ return FcTrue;
+}
+
+static FcBool
+FcCacheWriteString (FILE *f, const FcChar8 *string)
+{
+
+ if (putc ('"', f) == EOF)
+ return FcFalse;
+ if (!FcCacheWriteChars (f, string))
+ return FcFalse;
if (putc ('"', f) == EOF)
return FcFalse;
return FcTrue;
}
static FcBool
-FcFileCacheWriteUlong (FILE *f, unsigned long t)
+FcCacheWritePath (FILE *f, const FcChar8 *dir, const FcChar8 *file)
+{
+ if (putc ('"', f) == EOF)
+ return FcFalse;
+ if (dir)
+ if (!FcCacheWriteChars (f, dir))
+ return FcFalse;
+ if (dir && dir[strlen((const char *) dir) - 1] != '/')
+ if (putc ('/', f) == EOF)
+ return FcFalse;
+ if (!FcCacheWriteChars (f, file))
+ return FcFalse;
+ if (putc ('"', f) == EOF)
+ return FcFalse;
+ return FcTrue;
+}
+
+static FcBool
+FcCacheWriteUlong (FILE *f, unsigned long t)
{
int pow;
unsigned long temp, digit;
@@ -401,29 +209,542 @@
}
static FcBool
-FcFileCacheWriteInt (FILE *f, int i)
+FcCacheWriteInt (FILE *f, int i)
{
- return FcFileCacheWriteUlong (f, (unsigned long) i);
+ return FcCacheWriteUlong (f, (unsigned long) i);
}
static FcBool
-FcFileCacheWriteTime (FILE *f, time_t t)
+FcCacheWriteTime (FILE *f, time_t t)
{
- return FcFileCacheWriteUlong (f, (unsigned long) t);
+ return FcCacheWriteUlong (f, (unsigned long) t);
+}
+
+static FcBool
+FcCacheFontSetAdd (FcFontSet *set,
+ FcStrSet *dirs,
+ const FcChar8 *dir,
+ int dir_len,
+ const FcChar8 *file,
+ const FcChar8 *name)
+{
+ FcChar8 path_buf[8192], *path;
+ int len;
+ FcBool ret = FcFalse;
+ FcPattern *font;
+
+ path = path_buf;
+ len = (dir_len + 1 + strlen ((const char *) file) + 1);
+ if (len > sizeof (path_buf))
+ {
+ path = malloc (len);
+ if (!path)
+ return FcFalse;
+ }
+ strncpy ((char *) path, (const char *) dir, dir_len);
+ if (dir[dir_len - 1] != '/')
+ path[dir_len++] = '/';
+ strcpy ((char *) path + dir_len, (const char *) file);
+ if (!FcStrCmp (name, FC_FONT_FILE_DIR))
+ {
+ if (FcDebug () & FC_DBG_CACHEV)
+ printf (" dir cache dir \"%s\"\n", path);
+ ret = FcStrSetAdd (dirs, path);
+ }
+ else if (!FcStrCmp (name, FC_FONT_FILE_INVALID))
+ {
+ ret = FcTrue;
+ }
+ else
+ {
+ font = FcNameParse (name);
+ if (font)
+ {
+ if (FcDebug () & FC_DBG_CACHEV)
+ printf (" dir cache file \"%s\"\n", file);
+ ret = (FcPatternAddString (font, FC_FILE, path) &&
+ FcFontSetAdd (set, font));
+ if (!ret)
+ FcPatternDestroy (font);
+ }
+ }
+ if (path != path_buf) free (path);
+ return ret;
+
+}
+
+static unsigned int
+FcCacheHash (const FcChar8 *string)
+{
+ unsigned int h = 0;
+ FcChar8 c;
+
+ while ((c = *string++))
+ h = (h << 1) ^ c;
+ return 0;
+}
+
+/*
+ * Verify the saved timestamp for a file
+ */
+FcBool
+FcGlobalCacheCheckTime (FcGlobalCacheInfo *info)
+{
+ struct stat statb;
+
+ if (stat ((char *) info->file, &statb) < 0)
+ {
+ if (FcDebug () & FC_DBG_CACHE)
+ printf (" file missing\n");
+ return FcFalse;
+ }
+ if (statb.st_mtime != info->time)
+ {
+ if (FcDebug () & FC_DBG_CACHE)
+ printf (" timestamp mismatch (was %d is %d)\n",
+ (int) info->time, (int) statb.st_mtime);
+ return FcFalse;
+ }
+ return FcTrue;
+}
+
+void
+FcGlobalCacheReferenced (FcGlobalCache *cache,
+ FcGlobalCacheInfo *info)
+{
+ if (!info->referenced)
+ {
+ info->referenced = FcTrue;
+ cache->referenced++;
+ if (FcDebug () & FC_DBG_CACHE_REF)
+ printf ("Reference %d %s\n", cache->referenced, info->file);
+ }
+}
+
+/*
+ * Break a path into dir/base elements and compute the base hash
+ * and the dir length. This is shared between the functions
+ * which walk the file caches
+ */
+
+typedef struct _FcFilePathInfo {
+ const FcChar8 *dir;
+ int dir_len;
+ const FcChar8 *base;
+ unsigned int base_hash;
+} FcFilePathInfo;
+
+static FcFilePathInfo
+FcFilePathInfoGet (const FcChar8 *path)
+{
+ FcFilePathInfo i;
+ FcChar8 *slash;
+
+ slash = (FcChar8 *) strrchr ((const char *) path, '/');
+ if (slash)
+ {
+ i.dir = path;
+ i.dir_len = slash - path;
+ if (!i.dir_len)
+ i.dir_len = 1;
+ i.base = slash + 1;
+ }
+ else
+ {
+ i.dir = (const FcChar8 *) ".";
+ i.dir_len = 1;
+ i.base = path;
+ }
+ i.base_hash = FcCacheHash (i.base);
+ return i;
+}
+
+FcGlobalCacheDir *
+FcGlobalCacheDirGet (FcGlobalCache *cache,
+ const FcChar8 *dir,
+ int len,
+ FcBool create_missing)
+{
+ unsigned int hash = FcCacheHash (dir);
+ FcGlobalCacheDir *d, **prev;
+
+ for (prev = &cache->ents[hash % FC_GLOBAL_CACHE_DIR_HASH_SIZE];
+ (d = *prev);
+ prev = &(*prev)->next)
+ {
+ if (d->info.hash == hash && d->len == len &&
+ !strncmp ((const char *) d->info.file,
+ (const char *) dir, len))
+ break;
+ }
+ if (!(d = *prev))
+ {
+ int i;
+ if (!create_missing)
+ return 0;
+ d = malloc (sizeof (FcGlobalCacheDir) + len + 1);
+ if (!d)
+ return 0;
+ d->next = *prev;
+ *prev = d;
+ d->info.hash = hash;
+ d->info.file = (FcChar8 *) (d + 1);
+ strncpy ((char *) d->info.file, (const char *) dir, len);
+ d->info.file[len] = '\0';
+ d->info.time = 0;
+ d->info.referenced = FcFalse;
+ d->len = len;
+ for (i = 0; i < FC_GLOBAL_CACHE_FILE_HASH_SIZE; i++)
+ d->ents[i] = 0;
+ d->subdirs = 0;
+ }
+ return d;
+}
+
+static FcGlobalCacheInfo *
+FcGlobalCacheDirAdd (FcGlobalCache *cache,
+ const FcChar8 *dir,
+ time_t time,
+ FcBool replace)
+{
+ FcGlobalCacheDir *d;
+ FcFilePathInfo i;
+ FcGlobalCacheSubdir *subdir;
+ FcGlobalCacheDir *parent;
+
+ /*
+ * Add this directory to the cache
+ */
+ d = FcGlobalCacheDirGet (cache, dir, strlen ((const char *) dir), FcTrue);
+ if (!d)
+ return 0;
+ d->info.time = time;
+ i = FcFilePathInfoGet (dir);
+ /*
+ * Add this directory to the subdirectory list of the parent
+ */
+ parent = FcGlobalCacheDirGet (cache, i.dir, i.dir_len, FcTrue);
+ if (!parent)
+ return 0;
+ subdir = malloc (sizeof (FcGlobalCacheSubdir) +
+ strlen ((const char *) i.base) + 1);
+ if (!subdir)
+ return 0;
+ subdir->file = (FcChar8 *) (subdir + 1);
+ strcpy ((char *) subdir->file, (const char *) i.base);
+ subdir->next = parent->subdirs;
+ parent->subdirs = subdir;
+ return &d->info;
+}
+
+static void
+FcGlobalCacheDirDestroy (FcGlobalCacheDir *d)
+{
+ FcGlobalCacheFile *f, *next;
+ int h;
+ FcGlobalCacheSubdir *s, *nexts;
+
+ for (h = 0; h < FC_GLOBAL_CACHE_FILE_HASH_SIZE; h++)
+ for (f = d->ents[h]; f; f = next)
+ {
+ next = f->next;
+ free (f);
+ }
+ for (s = d->subdirs; s; s = nexts)
+ {
+ nexts = s->next;
+ free (s);
+ }
+ free (d);
}
FcBool
-FcFileCacheSave (FcFileCache *cache,
- const FcChar8 *cache_file)
+FcGlobalCacheScanDir (FcFontSet *set,
+ FcStrSet *dirs,
+ FcGlobalCache *cache,
+ const FcChar8 *dir)
{
- FILE *f;
+ FcGlobalCacheDir *d = FcGlobalCacheDirGet (cache, dir,
+ strlen ((const char *) dir),
+ FcFalse);
+ FcGlobalCacheFile *f;
+ int h;
+ int dir_len;
+ FcGlobalCacheSubdir *subdir;
+
+ if (FcDebug() & FC_DBG_CACHE)
+ printf ("FcGlobalCacheScanDir %s\n", dir);
+
+ if (!d)
+ {
+ if (FcDebug () & FC_DBG_CACHE)
+ printf ("\tNo dir cache entry\n");
+ return FcFalse;
+ }
+
+ if (!FcGlobalCacheCheckTime (&d->info))
+ {
+ if (FcDebug () & FC_DBG_CACHE)
+ printf ("\tdir cache entry time mismatch\n");
+ return FcFalse;
+ }
+
+ dir_len = strlen ((const char *) dir);
+ for (h = 0; h < FC_GLOBAL_CACHE_FILE_HASH_SIZE; h++)
+ for (f = d->ents[h]; f; f = f->next)
+ {
+ if (FcDebug() & FC_DBG_CACHEV)
+ printf ("FcGlobalCacheScanDir add file %s\n", f->info.file);
+ if (!FcCacheFontSetAdd (set, dirs, dir, dir_len,
+ f->info.file, f->name))
+ {
+ cache->broken = FcTrue;
+ return FcFalse;
+ }
+ FcGlobalCacheReferenced (cache, &f->info);
+ }
+ for (subdir = d->subdirs; subdir; subdir = subdir->next)
+ {
+ if (!FcCacheFontSetAdd (set, dirs, dir, dir_len,
+ subdir->file, FC_FONT_FILE_DIR))
+ {
+ cache->broken = FcTrue;
+ return FcFalse;
+ }
+ }
+
+ FcGlobalCacheReferenced (cache, &d->info);
+
+ return FcTrue;
+}
+
+/*
+ * Locate the cache entry for a particular file
+ */
+FcGlobalCacheFile *
+FcGlobalCacheFileGet (FcGlobalCache *cache,
+ const FcChar8 *file,
+ int id,
+ int *count)
+{
+ FcFilePathInfo i = FcFilePathInfoGet (file);
+ FcGlobalCacheDir *d = FcGlobalCacheDirGet (cache, i.dir,
+ i.dir_len, FcFalse);
+ FcGlobalCacheFile *f, *match = 0;
+ int max = -1;
+
+ if (!d)
+ return 0;
+ for (f = d->ents[i.base_hash % FC_GLOBAL_CACHE_FILE_HASH_SIZE]; f; f = f->next)
+ {
+ if (f->info.hash == i.base_hash &&
+ !strcmp ((const char *) f->info.file, (const char *) i.base))
+ {
+ if (f->id == id)
+ match = f;
+ if (f->id > max)
+ max = f->id;
+ }
+ }
+ if (count)
+ *count = max;
+ return match;
+}
+
+/*
+ * Add a file entry to the cache
+ */
+static FcGlobalCacheInfo *
+FcGlobalCacheFileAdd (FcGlobalCache *cache,
+ const FcChar8 *path,
+ int id,
+ time_t time,
+ const FcChar8 *name,
+ FcBool replace)
+{
+ FcFilePathInfo i = FcFilePathInfoGet (path);
+ FcGlobalCacheDir *d = FcGlobalCacheDirGet (cache, i.dir,
+ i.dir_len, FcTrue);
+ FcGlobalCacheFile *f, **prev;
+
+ if (!d)
+ return 0;
+ for (prev = &d->ents[i.base_hash % FC_GLOBAL_CACHE_FILE_HASH_SIZE];
+ (f = *prev);
+ prev = &(*prev)->next)
+ {
+ if (f->info.hash == i.base_hash &&
+ f->id == id &&
+ !strcmp ((const char *) f->info.file, (const char *) i.base))
+ {
+ break;
+ }
+ }
+ if (*prev)
+ {
+ if (!replace)
+ return 0;
+
+ f = *prev;
+ if (f->info.referenced)
+ cache->referenced--;
+ *prev = f->next;
+ free (f);
+ }
+ f = malloc (sizeof (FcGlobalCacheFile) +
+ strlen ((char *) i.base) + 1 +
+ strlen ((char *) name) + 1);
+ if (!f)
+ return 0;
+ f->next = *prev;
+ *prev = f;
+ f->info.hash = i.base_hash;
+ f->info.file = (FcChar8 *) (f + 1);
+ f->info.time = time;
+ f->info.referenced = FcFalse;
+ f->id = id;
+ f->name = f->info.file + strlen ((char *) i.base) + 1;
+ strcpy ((char *) f->info.file, (const char *) i.base);
+ strcpy ((char *) f->name, (const char *) name);
+ return &f->info;
+}
+
+FcGlobalCache *
+FcGlobalCacheCreate (void)
+{
+ FcGlobalCache *cache;
int h;
- FcFileCacheEnt *c;
- FcAtomic *atomic;
+
+ cache = malloc (sizeof (FcGlobalCache));
+ if (!cache)
+ return 0;
+ for (h = 0; h < FC_GLOBAL_CACHE_DIR_HASH_SIZE; h++)
+ cache->ents[h] = 0;
+ cache->entries = 0;
+ cache->referenced = 0;
+ cache->updated = FcFalse;
+ return cache;
+}
+
+void
+FcGlobalCacheDestroy (FcGlobalCache *cache)
+{
+ FcGlobalCacheDir *d, *next;
+ int h;
+
+ for (h = 0; h < FC_GLOBAL_CACHE_DIR_HASH_SIZE; h++)
+ {
+ for (d = cache->ents[h]; d; d = next)
+ {
+ next = d->next;
+ FcGlobalCacheDirDestroy (d);
+ }
+ }
+ free (cache);
+}
+
+/*
+ * Cache file syntax is quite simple:
+ *
+ * "file_name" id time "font_name" \n
+ */
+
+void
+FcGlobalCacheLoad (FcGlobalCache *cache,
+ const FcChar8 *cache_file)
+{
+ FILE *f;
+ FcChar8 file_buf[8192], *file;
+ int id;
+ time_t time;
+ FcChar8 name_buf[8192], *name;
+ FcGlobalCacheInfo *info;
+
+ f = fopen ((char *) cache_file, "r");
+ if (!f)
+ return;
+
+ cache->updated = FcFalse;
+ file = 0;
+ name = 0;
+ while ((file = FcCacheReadString (f, file_buf, sizeof (file_buf))) &&
+ FcCacheReadInt (f, &id) &&
+ FcCacheReadTime (f, &time) &&
+ (name = FcCacheReadString (f, name_buf, sizeof (name_buf))))
+ {
+ if (FcDebug () & FC_DBG_CACHEV)
+ printf ("FcGlobalCacheLoad \"%s\" \"%20.20s\"\n", file, name);
+ if (!FcStrCmp (name, FC_FONT_FILE_DIR))
+ info = FcGlobalCacheDirAdd (cache, file, time, FcFalse);
+ else
+ info = FcGlobalCacheFileAdd (cache, file, id, time, name, FcFalse);
+ if (!info)
+ cache->broken = FcTrue;
+ else
+ cache->entries++;
+ if (FcDebug () & FC_DBG_CACHE_REF)
+ printf ("FcGlobalCacheLoad entry %d %s\n",
+ cache->entries, file);
+ if (file != file_buf)
+ free (file);
+ if (name != name_buf)
+ free (name);
+ file = 0;
+ name = 0;
+ }
+ if (file && file != file_buf)
+ free (file);
+ if (name && name != name_buf)
+ free (name);
+ fclose (f);
+}
+
+FcBool
+FcGlobalCacheUpdate (FcGlobalCache *cache,
+ const FcChar8 *file,
+ int id,
+ const FcChar8 *name)
+{
+ const FcChar8 *match;
+ struct stat statb;
+ FcGlobalCacheInfo *info;
+
+ match = file;
+
+ if (stat ((char *) file, &statb) < 0)
+ return FcFalse;
+ if (S_ISDIR (statb.st_mode))
+ info = FcGlobalCacheDirAdd (cache, file, statb.st_mtime,
+ FcTrue);
+ else
+ info = FcGlobalCacheFileAdd (cache, file, id, statb.st_mtime,
+ name, FcTrue);
+ if (info)
+ {
+ FcGlobalCacheReferenced (cache, info);
+ cache->updated = FcTrue;
+ }
+ else
+ cache->broken = FcTrue;
+ return info != 0;
+}
+
+FcBool
+FcGlobalCacheSave (FcGlobalCache *cache,
+ const FcChar8 *cache_file)
+{
+ FILE *f;
+ int dir_hash, file_hash;
+ FcGlobalCacheDir *dir;
+ FcGlobalCacheFile *file;
+ FcAtomic *atomic;
if (!cache->updated && cache->referenced == cache->entries)
return FcTrue;
+ if (cache->broken)
+ return FcFalse;
+
/* Set-UID programs can't safely update the cache */
if (getuid () != geteuid ())
return FcFalse;
@@ -437,28 +758,53 @@
if (!f)
goto bail2;
- for (h = 0; h < FC_FILE_CACHE_HASH_SIZE; h++)
+ for (dir_hash = 0; dir_hash < FC_GLOBAL_CACHE_DIR_HASH_SIZE; dir_hash++)
{
- for (c = cache->ents[h]; c; c = c->next)
+ for (dir = cache->ents[dir_hash]; dir; dir = dir->next)
{
- if (!c->referenced)
+ if (!dir->info.referenced)
continue;
- if (!FcFileCacheWriteString (f, c->file))
+ if (!FcCacheWriteString (f, dir->info.file))
goto bail4;
if (putc (' ', f) == EOF)
goto bail4;
- if (!FcFileCacheWriteInt (f, c->id))
+ if (!FcCacheWriteInt (f, 0))
goto bail4;
if (putc (' ', f) == EOF)
goto bail4;
- if (!FcFileCacheWriteTime (f, c->time))
+ if (!FcCacheWriteTime (f, dir->info.time))
goto bail4;
if (putc (' ', f) == EOF)
goto bail4;
- if (!FcFileCacheWriteString (f, c->name))
+ if (!FcCacheWriteString (f, (FcChar8 *) FC_FONT_FILE_DIR))
goto bail4;
if (putc ('\n', f) == EOF)
goto bail4;
+
+ for (file_hash = 0; file_hash < FC_GLOBAL_CACHE_FILE_HASH_SIZE; file_hash++)
+ {
+ for (file = dir->ents[file_hash]; file; file = file->next)
+ {
+ if (!file->info.referenced)
+ continue;
+ if (!FcCacheWritePath (f, dir->info.file, file->info.file))
+ goto bail4;
+ if (putc (' ', f) == EOF)
+ goto bail4;
+ if (!FcCacheWriteInt (f, file->id < 0 ? 0 : file->id))
+ goto bail4;
+ if (putc (' ', f) == EOF)
+ goto bail4;
+ if (!FcCacheWriteTime (f, file->info.time))
+ goto bail4;
+ if (putc (' ', f) == EOF)
+ goto bail4;
+ if (!FcCacheWriteString (f, file->name))
+ goto bail4;
+ if (putc ('\n', f) == EOF)
+ goto bail4;
+ }
+ }
}
}
@@ -487,21 +833,22 @@
}
FcBool
-FcFileCacheValid (const FcChar8 *cache_file)
+FcDirCacheValid (const FcChar8 *dir)
{
- FcChar8 *dir = FcStrDirname (cache_file);
+ FcChar8 *cache_file = FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE);
struct stat file_stat, dir_stat;
- if (!dir)
- return FcFalse;
if (stat ((char *) dir, &dir_stat) < 0)
{
- FcStrFree (dir);
+ FcStrFree (cache_file);
return FcFalse;
}
- FcStrFree (dir);
if (stat ((char *) cache_file, &file_stat) < 0)
+ {
+ FcStrFree (cache_file);
return FcFalse;
+ }
+ FcStrFree (cache_file);
/*
* If the directory has been modified more recently than
* the cache file, the cache is not valid
@@ -512,123 +859,72 @@
}
FcBool
-FcFileCacheReadDir (FcFontSet *set, FcStrSet *dirs, const FcChar8 *cache_file)
+FcDirCacheReadDir (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
{
- FcPattern *font;
+ FcChar8 *cache_file = FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE);
FILE *f;
FcChar8 *base;
int id;
int dir_len;
- int file_len;
FcChar8 file_buf[8192], *file;
FcChar8 name_buf[8192], *name;
- FcChar8 path_buf[8192], *path;
FcBool ret = FcFalse;
+ if (!cache_file)
+ goto bail0;
+
if (FcDebug () & FC_DBG_CACHE)
- {
- printf ("FcFileCacheReadDir cache_file \"%s\"\n", cache_file);
- }
+ printf ("FcDirCacheReadDir cache_file \"%s\"\n", cache_file);
f = fopen ((char *) cache_file, "r");
if (!f)
{
if (FcDebug () & FC_DBG_CACHE)
- {
printf (" no cache file\n");
- }
- goto bail0;
+ goto bail1;
}
- if (!FcFileCacheValid (cache_file))
+ if (!FcDirCacheValid (dir))
{
if (FcDebug () & FC_DBG_CACHE)
- {
printf (" cache file older than directory\n");
- }
- goto bail1;
+ goto bail2;
}
base = (FcChar8 *) strrchr ((char *) cache_file, '/');
if (!base)
- goto bail1;
+ goto bail2;
base++;
dir_len = base - cache_file;
- if (dir_len < sizeof (path_buf))
- strncpy ((char *) path_buf, (const char *) cache_file, dir_len);
file = 0;
name = 0;
- path = 0;
- while ((file = FcFileCacheReadString (f, file_buf, sizeof (file_buf))) &&
- FcFileCacheReadInt (f, &id) &&
- (name = FcFileCacheReadString (f, name_buf, sizeof (name_buf))))
+ while ((file = FcCacheReadString (f, file_buf, sizeof (file_buf))) &&
+ FcCacheReadInt (f, &id) &&
+ (name = FcCacheReadString (f, name_buf, sizeof (name_buf))))
{
- file_len = strlen ((const char *) file);
- if (dir_len + file_len + 1 > sizeof (path_buf))
- {
- path = malloc (dir_len + file_len + 1);
- if (!path)
- goto bail2;
- strncpy ((char *) path, (const char *) cache_file, dir_len);
- }
- else
- path = path_buf;
-
- strcpy ((char *) path + dir_len, (const char *) file);
- if (!FcStrCmp (name, FC_FONT_FILE_DIR))
- {
- if (FcDebug () & FC_DBG_CACHEV)
- {
- printf (" dir cache dir \"%s\"\n", path);
- }
- if (!FcStrSetAdd (dirs, path))
- goto bail2;
- }
- else
- {
- font = FcNameParse (name);
- if (font)
- {
- if (FcDebug () & FC_DBG_CACHEV)
- {
- printf (" dir cache file \"%s\"\n", file);
- }
- if (!FcPatternAddString (font, FC_FILE, path))
- {
- FcPatternDestroy (font);
- goto bail2;
- }
- if (!FcFontSetAdd (set, font))
- {
- FcPatternDestroy (font);
- goto bail2;
- }
- }
- }
- if (path != path_buf)
- free (path);
+ if (!FcCacheFontSetAdd (set, dirs, cache_file, dir_len,
+ file, name))
+ goto bail3;
if (file != file_buf)
free (file);
if (name != name_buf)
free (name);
- path = file = name = 0;
+ file = name = 0;
}
if (FcDebug () & FC_DBG_CACHE)
- {
printf (" cache loaded\n");
- }
ret = FcTrue;
-bail2:
- if (path && path != path_buf)
- free (path);
+bail3:
if (file && file != file_buf)
free (file);
if (name && name != name_buf)
free (name);
-bail1:
+bail2:
fclose (f);
+bail1:
+ free (cache_file);
bail0:
return ret;
}
@@ -650,8 +946,9 @@
}
FcBool
-FcFileCacheWriteDir (FcFontSet *set, FcStrSet *dirs, const FcChar8 *cache_file)
+FcDirCacheWriteDir (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
{
+ FcChar8 *cache_file = FcStrPlus (dir, (FcChar8 *) "/" FC_DIR_CACHE_FILE);
FcPattern *font;
FILE *f;
FcChar8 *name;
@@ -660,83 +957,88 @@
int id;
FcBool ret;
FcStrList *list;
- FcChar8 *dir;
+ if (!cache_file)
+ goto bail0;
if (FcDebug () & FC_DBG_CACHE)
- printf ("FcFileCacheWriteDir cache_file \"%s\"\n", cache_file);
+ printf ("FcDirCacheWriteDir cache_file \"%s\"\n", cache_file);
f = fopen ((char *) cache_file, "w");
if (!f)
{
if (FcDebug () & FC_DBG_CACHE)
printf (" can't create \"%s\"\n", cache_file);
- goto bail0;
+ goto bail1;
}
list = FcStrListCreate (dirs);
if (!list)
- goto bail1;
+ goto bail2;
while ((dir = FcStrListNext (list)))
{
base = FcFileBaseName (cache_file, dir);
- if (!FcFileCacheWriteString (f, base))
- goto bail2;
+ if (!FcCacheWriteString (f, base))
+ goto bail3;
if (putc (' ', f) == EOF)
- goto bail2;
- if (!FcFileCacheWriteInt (f, 0))
- goto bail2;
+ goto bail3;
+ if (!FcCacheWriteInt (f, 0))
+ goto bail3;
if (putc (' ', f) == EOF)
- goto bail2;
- if (!FcFileCacheWriteString (f, FC_FONT_FILE_DIR))
- goto bail2;
+ goto bail3;
+ if (!FcCacheWriteString (f, FC_FONT_FILE_DIR))
+ goto bail3;
if (putc ('\n', f) == EOF)
- goto bail2;
+ goto bail3;
}
for (n = 0; n < set->nfont; n++)
{
font = set->fonts[n];
if (FcPatternGetString (font, FC_FILE, 0, (FcChar8 **) &file) != FcResultMatch)
- goto bail2;
+ goto bail3;
base = FcFileBaseName (cache_file, file);
if (FcPatternGetInteger (font, FC_INDEX, 0, &id) != FcResultMatch)
- goto bail2;
+ goto bail3;
if (FcDebug () & FC_DBG_CACHEV)
printf (" write file \"%s\"\n", base);
- if (!FcFileCacheWriteString (f, base))
- goto bail2;
+ if (!FcCacheWriteString (f, base))
+ goto bail3;
if (putc (' ', f) == EOF)
- goto bail2;
- if (!FcFileCacheWriteInt (f, id))
- goto bail2;
+ goto bail3;
+ if (!FcCacheWriteInt (f, id))
+ goto bail3;
if (putc (' ', f) == EOF)
- goto bail2;
+ goto bail3;
name = FcNameUnparse (font);
if (!name)
- goto bail2;
- ret = FcFileCacheWriteString (f, name);
+ goto bail3;
+ ret = FcCacheWriteString (f, name);
free (name);
if (!ret)
- goto bail2;
+ goto bail3;
if (putc ('\n', f) == EOF)
- goto bail2;
+ goto bail3;
}
FcStrListDone (list);
if (fclose (f) == EOF)
- goto bail0;
+ goto bail1;
+ free (cache_file);
+
if (FcDebug () & FC_DBG_CACHE)
printf (" cache written\n");
return FcTrue;
-bail2:
+bail3:
FcStrListDone (list);
-bail1:
+bail2:
fclose (f);
-bail0:
+bail1:
unlink ((char *) cache_file);
+ free (cache_file);
+bail0:
return FcFalse;
}
diff --git a/src/fccfg.c b/src/fccfg.c
index 9c638a3..4d51519 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -171,20 +171,20 @@
FcBool
FcConfigBuildFonts (FcConfig *config)
{
- FcFontSet *fonts;
- FcFileCache *cache;
- FcStrList *list;
- FcChar8 *dir;
+ FcFontSet *fonts;
+ FcGlobalCache *cache;
+ FcStrList *list;
+ FcChar8 *dir;
fonts = FcFontSetCreate ();
if (!fonts)
goto bail0;
- cache = FcFileCacheCreate ();
+ cache = FcGlobalCacheCreate ();
if (!cache)
goto bail1;
- FcFileCacheLoad (cache, config->cache);
+ FcGlobalCacheLoad (cache, config->cache);
list = FcConfigGetFontDirs (config);
if (!list)
@@ -202,8 +202,8 @@
if (FcDebug () & FC_DBG_FONTSET)
FcFontSetPrint (fonts);
- FcFileCacheSave (cache, config->cache);
- FcFileCacheDestroy (cache);
+ FcGlobalCacheSave (cache, config->cache);
+ FcGlobalCacheDestroy (cache);
FcConfigSetFonts (config, fonts, FcSetSystem);
@@ -456,8 +456,6 @@
FcValueList *value;
} FcSubState;
-static const FcMatrix FcIdentityMatrix = { 1, 0, 0, 1 };
-
static FcValue
FcConfigPromote (FcValue v, FcValue u)
{
@@ -468,9 +466,8 @@
}
else if (v.type == FcTypeVoid && u.type == FcTypeMatrix)
{
- v.u.m = FcMatrixCopy (&FcIdentityMatrix);
- if (v.u.m)
- v.type = FcTypeMatrix;
+ v.u.m = &FcIdentityMatrix;
+ v.type = FcTypeMatrix;
}
return v;
}
diff --git a/src/fcdir.c b/src/fcdir.c
index cc8a9b1..8843da0 100644
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -38,44 +38,71 @@
FcBool
FcFileScan (FcFontSet *set,
FcStrSet *dirs,
- FcFileCache *cache,
+ FcGlobalCache *cache,
FcBlanks *blanks,
const FcChar8 *file,
FcBool force)
{
- int id;
- FcChar8 *name;
- FcPattern *font;
- FcBool ret = FcTrue;
- FcBool isDir;
- int count;
+ int id;
+ FcChar8 *name;
+ FcPattern *font;
+ FcBool ret = FcTrue;
+ FcBool isDir;
+ int count = 0;
+ FcGlobalCacheFile *cache_file;
+ FcGlobalCacheDir *cache_dir;
+ FcBool need_scan;
+ if (force)
+ cache = 0;
id = 0;
do
{
- if (!force && cache)
- name = FcFileCacheFind (cache, file, id, &count);
- else
- name = 0;
- if (name)
+ need_scan = FcTrue;
+ font = 0;
+ /*
+ * Check the cache
+ */
+ if (cache)
{
- /* "." means the file doesn't contain a font */
- if (FcStrCmp (name, FC_FONT_FILE_INVALID) == 0)
- font = 0;
- else if (FcStrCmp (name, FC_FONT_FILE_DIR) == 0)
+ if ((cache_file = FcGlobalCacheFileGet (cache, file, id, &count)))
{
- ret = FcStrSetAdd (dirs, file);
- font = 0;
+ /*
+ * Found a cache entry for the file
+ */
+ if (FcGlobalCacheCheckTime (&cache_file->info))
+ {
+ name = cache_file->name;
+ need_scan = FcFalse;
+ FcGlobalCacheReferenced (cache, &cache_file->info);
+ /* "." means the file doesn't contain a font */
+ if (FcStrCmp (name, FC_FONT_FILE_INVALID) != 0)
+ {
+ font = FcNameParse (name);
+ if (font)
+ if (!FcPatternAddString (font, FC_FILE, file))
+ ret = FcFalse;
+ }
+ }
}
- else
+ else if ((cache_dir = FcGlobalCacheDirGet (cache, file,
+ strlen ((const char *) file),
+ FcFalse)))
{
- font = FcNameParse (name);
- if (font)
- if (!FcPatternAddString (font, FC_FILE, file))
+ if (FcGlobalCacheCheckTime (&cache_dir->info))
+ {
+ font = 0;
+ need_scan = FcFalse;
+ FcGlobalCacheReferenced (cache, &cache_dir->info);
+ if (!FcStrSetAdd (dirs, file))
ret = FcFalse;
+ }
}
}
- else
+ /*
+ * Nothing in the cache, scan the file
+ */
+ if (need_scan)
{
if (FcDebug () & FC_DBG_SCAN)
{
@@ -91,35 +118,24 @@
isDir = FcTrue;
ret = FcStrSetAdd (dirs, file);
}
- if (!force && cache)
+ /*
+ * Update the cache
+ */
+ if (cache && font)
{
- if (font)
- {
- FcChar8 *unparse;
+ FcChar8 *unparse;
- unparse = FcNameUnparse (font);
- if (unparse)
- {
- (void) FcFileCacheUpdate (cache, file, id, unparse);
- free (unparse);
- }
- }
- else
+ unparse = FcNameUnparse (font);
+ if (unparse)
{
- if (isDir)
- {
- FcFileCacheUpdate (cache, file, id, (FcChar8 *)
- FC_FONT_FILE_DIR);
- }
- else
- {
- /* negative cache files not containing fonts */
- FcFileCacheUpdate (cache, file, id, (FcChar8 *)
- FC_FONT_FILE_INVALID);
- }
+ (void) FcGlobalCacheUpdate (cache, file, id, unparse);
+ free (unparse);
}
}
}
+ /*
+ * Add the font
+ */
if (font)
{
if (!FcFontSetAdd (set, font))
@@ -134,40 +150,37 @@
return ret;
}
-FcBool
-FcDirCacheValid (const FcChar8 *dir)
-{
- FcChar8 *path;
- FcBool ret;
-
- path = (FcChar8 *) malloc (strlen ((const char *) dir) + 1 +
- strlen ((const char *) FC_DIR_CACHE_FILE) + 1);
- if (!path)
- return FcFalse;
- strcpy ((char *) path, (const char *) dir);
- strcat ((char *) path, (const char *) "/");
- strcat ((char *) path, (const char *) FC_DIR_CACHE_FILE);
- ret = FcFileCacheValid (path);
- free (path);
- return ret;
-}
-
#define FC_MAX_FILE_LEN 4096
FcBool
FcDirScan (FcFontSet *set,
FcStrSet *dirs,
- FcFileCache *cache,
+ FcGlobalCache *cache,
FcBlanks *blanks,
const FcChar8 *dir,
FcBool force)
{
- DIR *d;
- struct dirent *e;
- FcChar8 *file;
- FcChar8 *base;
- FcBool ret = FcTrue;
+ DIR *d;
+ struct dirent *e;
+ FcChar8 *file;
+ FcChar8 *base;
+ FcBool ret = FcTrue;
+ if (!force)
+ {
+ /*
+ * Check fonts.cache file
+ */
+ if (FcDirCacheReadDir (set, dirs, dir))
+ return FcTrue;
+
+ /*
+ * Check ~/.fonts.cache file
+ */
+ if (cache && FcGlobalCacheScanDir (set, dirs, cache, dir))
+ return FcTrue;
+ }
+
file = (FcChar8 *) malloc (strlen ((char *) dir) + 1 + FC_MAX_FILE_LEN + 1);
if (!file)
return FcFalse;
@@ -175,18 +188,9 @@
strcpy ((char *) file, (char *) dir);
strcat ((char *) file, "/");
base = file + strlen ((char *) file);
- if (!force)
- {
- strcpy ((char *) base, FC_DIR_CACHE_FILE);
-
- if (FcFileCacheReadDir (set, dirs, file))
- {
- free (file);
- return FcTrue;
- }
- }
d = opendir ((char *) dir);
+
if (!d)
{
free (file);
@@ -205,25 +209,14 @@
}
free (file);
closedir (d);
+ if (ret && cache)
+ FcGlobalCacheUpdate (cache, dir, 0, 0);
+
return ret;
}
FcBool
FcDirSave (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir)
{
- FcChar8 *file;
- FcChar8 *base;
- FcBool ret;
-
- file = (FcChar8 *) malloc (strlen ((char *) dir) + 1 + 256 + 1);
- if (!file)
- return FcFalse;
-
- strcpy ((char *) file, (char *) dir);
- strcat ((char *) file, "/");
- base = file + strlen ((char *) file);
- strcpy ((char *) base, FC_DIR_CACHE_FILE);
- ret = FcFileCacheWriteDir (set, dirs, file);
- free (file);
- return ret;
+ return FcDirCacheWriteDir (set, dirs, dir);
}
diff --git a/src/fcint.h b/src/fcint.h
index a40ef88..4e67599 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -195,24 +195,53 @@
int size;
} FcStrBuf;
-typedef struct _FcFileCacheEnt {
- struct _FcFileCacheEnt *next;
- unsigned int hash;
- FcChar8 *file;
- int id;
- time_t time;
- FcChar8 *name;
- FcBool referenced;
-} FcFileCacheEnt;
+/*
+ * The per-user ~/.fonts.cache file is loaded into
+ * this data structure. Each directory gets a substructure
+ * which is validated by comparing the directory timestamp with
+ * that saved in the cache. When valid, the entire directory cache
+ * can be immediately loaded without reading the directory. Otherwise,
+ * the files are checked individually; updated files are loaded into the
+ * cache which is then rewritten to the users home directory
+ */
-#define FC_FILE_CACHE_HASH_SIZE 509
+#define FC_GLOBAL_CACHE_DIR_HASH_SIZE 37
+#define FC_GLOBAL_CACHE_FILE_HASH_SIZE 67
-struct _FcFileCache {
- FcFileCacheEnt *ents[FC_FILE_CACHE_HASH_SIZE];
- FcBool updated;
- int entries;
- int referenced;
-};
+typedef struct _FcGlobalCacheInfo {
+ unsigned int hash;
+ FcChar8 *file;
+ time_t time;
+ FcBool referenced;
+} FcGlobalCacheInfo;
+
+typedef struct _FcGlobalCacheFile {
+ struct _FcGlobalCacheFile *next;
+ FcGlobalCacheInfo info;
+ int id;
+ FcChar8 *name;
+} FcGlobalCacheFile;
+
+typedef struct _FcGlobalCacheSubdir {
+ struct _FcGlobalCacheSubdir *next;
+ FcChar8 *file;
+} FcGlobalCacheSubdir;
+
+typedef struct _FcGlobalCacheDir {
+ struct _FcGlobalCacheDir *next;
+ FcGlobalCacheInfo info;
+ int len;
+ FcGlobalCacheFile *ents[FC_GLOBAL_CACHE_FILE_HASH_SIZE];
+ FcGlobalCacheSubdir *subdirs;
+} FcGlobalCacheDir;
+
+typedef struct _FcGlobalCache {
+ FcGlobalCacheDir *ents[FC_GLOBAL_CACHE_DIR_HASH_SIZE];
+ FcBool updated;
+ FcBool broken;
+ int entries;
+ int referenced;
+} FcGlobalCache;
struct _FcAtomic {
FcChar8 *file; /* original file name */
@@ -284,40 +313,60 @@
/* fccache.c */
-FcFileCache *
-FcFileCacheCreate (void);
-
-FcChar8 *
-FcFileCacheFind (FcFileCache *cache,
- const FcChar8 *file,
- int id,
- int *count);
+FcGlobalCache *
+FcGlobalCacheCreate (void);
void
-FcFileCacheDestroy (FcFileCache *cache);
+FcGlobalCacheDestroy (FcGlobalCache *cache);
FcBool
-FcFileCacheValid (const FcChar8 *cache_file);
+FcGlobalCacheCheckTime (FcGlobalCacheInfo *info);
void
-FcFileCacheLoad (FcFileCache *cache,
- const FcChar8 *cache_file);
+FcGlobalCacheReferenced (FcGlobalCache *cache,
+ FcGlobalCacheInfo *info);
+
+FcGlobalCacheDir *
+FcGlobalCacheDirGet (FcGlobalCache *cache,
+ const FcChar8 *dir,
+ int len,
+ FcBool create_missing);
FcBool
-FcFileCacheUpdate (FcFileCache *cache,
- const FcChar8 *file,
- int id,
- const FcChar8 *name);
+FcGlobalCacheScanDir (FcFontSet *set,
+ FcStrSet *dirs,
+ FcGlobalCache *cache,
+ const FcChar8 *dir);
+
+FcGlobalCacheFile *
+FcGlobalCacheFileGet (FcGlobalCache *cache,
+ const FcChar8 *file,
+ int id,
+ int *count);
+
+
+void
+FcGlobalCacheLoad (FcGlobalCache *cache,
+ const FcChar8 *cache_file);
FcBool
-FcFileCacheSave (FcFileCache *cache,
- const FcChar8 *cache_file);
+FcGlobalCacheUpdate (FcGlobalCache *cache,
+ const FcChar8 *file,
+ int id,
+ const FcChar8 *name);
FcBool
-FcFileCacheReadDir (FcFontSet *set, FcStrSet *dirs, const FcChar8 *cache_file);
+FcGlobalCacheSave (FcGlobalCache *cache,
+ const FcChar8 *cache_file);
FcBool
-FcFileCacheWriteDir (FcFontSet *set, FcStrSet *dirs, const FcChar8 *cache_file);
+FcDirCacheValid (const FcChar8 *cache_file);
+
+FcBool
+FcDirCacheReadDir (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir);
+
+FcBool
+FcDirCacheWriteDir (FcFontSet *set, FcStrSet *dirs, const FcChar8 *dir);
/* fccfg.c */
@@ -523,6 +572,9 @@
/* fcrender.c */
/* fcmatrix.c */
+
+extern const FcMatrix FcIdentityMatrix;
+
void
FcMatrixFree (FcMatrix *mat);
diff --git a/src/fcmatrix.c b/src/fcmatrix.c
index d2a9f1e..b6166a3 100644
--- a/src/fcmatrix.c
+++ b/src/fcmatrix.c
@@ -27,6 +27,8 @@
#include <ctype.h>
#include "fcint.h"
+const FcMatrix FcIdentityMatrix = { 1, 0, 0, 1 };
+
FcMatrix *
FcMatrixCopy (const FcMatrix *mat)
{
@@ -44,8 +46,11 @@
void
FcMatrixFree (FcMatrix *mat)
{
- FcMemFree (FC_MEM_MATRIX, sizeof (FcMatrix));
- free (mat);
+ if (mat != &FcIdentityMatrix)
+ {
+ FcMemFree (FC_MEM_MATRIX, sizeof (FcMatrix));
+ free (mat);
+ }
}
FcBool
