};
static void MD5Init(struct MD5Context *ctx);
-static void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len);
+static void MD5Update(struct MD5Context *ctx, const unsigned char *buf, unsigned len);
static void MD5Final(unsigned char digest[16], struct MD5Context *ctx);
static void MD5Transform(FcChar32 buf[4], FcChar32 in[16]);
struct MD5Context ctx;
MD5Init (&ctx);
- MD5Update (&ctx, (unsigned char *)dir, strlen ((char *) dir));
+ MD5Update (&ctx, (const unsigned char *)dir, strlen ((const char *) dir));
MD5Final (hash, &ctx);
if (!cache_hashed)
break;
(void) unlink ((char *) cache_hashed);
+ FcStrFree (cache_hashed);
}
FcStrListDone (list);
/* return FcFalse if something went wrong */
*/
static FcBool
FcDirCacheProcess (FcConfig *config, const FcChar8 *dir,
- FcBool (*callback) (int fd, struct stat *stat, void *closure),
+ FcBool (*callback) (int fd, struct stat *fd_stat,
+ struct stat *dir_stat, void *closure),
void *closure, FcChar8 **cache_file_ret)
{
int fd = -1;
break;
fd = FcDirCacheOpenFile (cache_hashed, &file_stat);
if (fd >= 0) {
- if (dir_stat.st_mtime <= file_stat.st_mtime)
+ ret = (*callback) (fd, &file_stat, &dir_stat, closure);
+ close (fd);
+ if (ret)
{
- ret = (*callback) (fd, &file_stat, closure);
- if (ret)
- {
- if (cache_file_ret)
- *cache_file_ret = cache_hashed;
- else
- FcStrFree (cache_hashed);
- close (fd);
- break;
- }
+ if (cache_file_ret)
+ *cache_file_ret = cache_hashed;
+ else
+ FcStrFree (cache_hashed);
+ break;
}
- close (fd);
}
FcStrFree (cache_hashed);
}
assert (fcCacheMaxLevel == 0);
}
+static FcBool
+FcCacheTimeValid (FcCache *cache, struct stat *dir_stat)
+{
+ struct stat dir_static;
+
+ if (!dir_stat)
+ {
+ if (stat ((const char *) FcCacheDir (cache), &dir_static) < 0)
+ return FcFalse;
+ dir_stat = &dir_static;
+ }
+ if (FcDebug () & FC_DBG_CACHE)
+ printf ("FcCacheTimeValid dir \"%s\" cache time %d dir time %d\n",
+ FcCacheDir (cache), cache->mtime, (int) dir_stat->st_mtime);
+ return cache->mtime == (int) dir_stat->st_mtime;
+}
+
/*
* Map a cache file into memory
*/
static FcCache *
-FcDirCacheMapFd (int fd, struct stat *fd_stat)
+FcDirCacheMapFd (int fd, struct stat *fd_stat, struct stat *dir_stat)
{
FcCache *cache;
FcBool allocated = FcFalse;
if (cache)
return cache;
/*
- * For small cache files, just read them into memory
+ * Lage cache files are mmap'ed, smaller cache files are read. This
+ * balances the system cost of mmap against per-process memory usage.
*/
if (fd_stat->st_size >= FC_CACHE_MIN_MMAP)
{
if (cache->magic != FC_CACHE_MAGIC_MMAP ||
cache->version < FC_CACHE_CONTENT_VERSION ||
cache->size != fd_stat->st_size ||
+ !FcCacheTimeValid (cache, dir_stat) ||
!FcCacheInsert (cache, fd_stat))
{
if (allocated)
}
static FcBool
-FcDirCacheMapHelper (int fd, struct stat *fd_stat, void *closure)
+FcDirCacheMapHelper (int fd, struct stat *fd_stat, struct stat *dir_stat, void *closure)
{
- FcCache *cache = FcDirCacheMapFd (fd, fd_stat);
+ FcCache *cache = FcDirCacheMapFd (fd, fd_stat, dir_stat);
if (!cache)
return FcFalse;
{
int fd;
FcCache *cache;
+ struct stat my_file_stat;
+ if (!file_stat)
+ file_stat = &my_file_stat;
fd = FcDirCacheOpenFile (cache_file, file_stat);
if (fd < 0)
return NULL;
- cache = FcDirCacheMapFd (fd, file_stat);
+ cache = FcDirCacheMapFd (fd, file_stat, NULL);
close (fd);
return cache;
}
* the magic number and the size field
*/
static FcBool
-FcDirCacheValidateHelper (int fd, struct stat *fd_stat, void *closure)
+FcDirCacheValidateHelper (int fd, struct stat *fd_stat, struct stat *dir_stat, void *closure)
{
FcBool ret = FcTrue;
FcCache c;
ret = FcFalse;
else if (fd_stat->st_size != c.size)
ret = FcFalse;
+ else if (c.mtime != (int) dir_stat->st_mtime)
+ ret = FcFalse;
return ret;
}
* Build a cache structure from the given contents
*/
FcCache *
-FcDirCacheBuild (FcFontSet *set, const FcChar8 *dir, FcStrSet *dirs)
+FcDirCacheBuild (FcFontSet *set, const FcChar8 *dir, struct stat *dir_stat, FcStrSet *dirs)
{
FcSerialize *serialize = FcSerializeCreate ();
FcCache *cache;
cache->magic = FC_CACHE_MAGIC_ALLOC;
cache->version = FC_CACHE_CONTENT_VERSION;
cache->size = serialize->size;
+ cache->mtime = (int) dir_stat->st_mtime;
/*
* Serialize directory name
parent = FcStrDirname (dir);
if (!parent)
return FcFalse;
- if (access ((char *) parent, W_OK|X_OK) == 0)
+ if (access ((char *) parent, F_OK) == 0)
ret = mkdir ((char *) dir, 0777) == 0;
else if (access ((char *) parent, F_OK) == -1)
ret = FcMakeDirectory (parent) && (mkdir ((char *) dir, 0777) == 0);
if (!list)
return FcFalse;
while ((test_dir = FcStrListNext (list))) {
- if (access ((char *) test_dir, W_OK|X_OK) == 0)
+ if (access ((char *) test_dir, W_OK) == 0)
{
cache_dir = test_dir;
break;
* Update context to reflect the concatenation of another buffer full
* of bytes.
*/
-static void MD5Update(struct MD5Context *ctx, unsigned char *buf, unsigned len)
+static void MD5Update(struct MD5Context *ctx, const unsigned char *buf, unsigned len)
{
FcChar32 t;