/*
* Geeqie
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: Vladimir Nadvornik
*
GList *list;
gulong max_size;
gulong size;
- };
+};
typedef struct _FileCacheEntry FileCacheEntry;
struct _FileCacheEntry {
FileData *fd;
gulong size;
- };
+};
static void file_cache_notify_cb(FileData *fd, NotifyType type, gpointer data);
+static void file_cache_remove_fd(FileCacheData *fc, FileData *fd);
FileCacheData *file_cache_new(FileCacheReleaseFunc release, gulong max_size)
{
FileCacheData *fc = g_new(FileCacheData, 1);
+
fc->release = release;
fc->list = NULL;
fc->max_size = max_size;
if (fce->fd == fd)
{
/* entry exists */
- DEBUG_1("cache hit: fc=%p %s", fc, fd->path);
+ DEBUG_2("cache hit: fc=%p %s", fc, fd->path);
if (work == fc->list) return TRUE; /* already at the beginning */
/* move it to the beginning */
- DEBUG_1("cache move to front: fc=%p %s", fc, fd->path);
+ DEBUG_2("cache move to front: fc=%p %s", fc, fd->path);
fc->list = g_list_remove_link(fc->list, work);
fc->list = g_list_concat(work, fc->list);
- if (file_data_check_changed_files(fd)) /* this will eventually remove changed files from cache via file_cache_notify_cb */
+ if (file_data_check_changed_files(fd)) {
+ /* file has been changed, cance entry is no longer valid */
+ file_cache_remove_fd(fc, fd);
return FALSE;
-
+ }
if (debug_file_cache) file_cache_dump(fc);
return TRUE;
}
work = work->next;
}
- DEBUG_1("cache miss: fc=%p %s", fc, fd->path);
+ DEBUG_2("cache miss: fc=%p %s", fc, fd->path);
return FALSE;
}
fc->list = g_list_delete_link(fc->list, work);
work = prev;
- DEBUG_1("file changed - cache remove: fc=%p %s", fc, last_fe->fd->path);
+ DEBUG_2("file changed - cache remove: fc=%p %s", fc, last_fe->fd->path);
fc->size -= last_fe->size;
fc->release(last_fe->fd);
file_data_unref(last_fe->fd);
if (file_cache_get(fc, fd)) return;
- DEBUG_1("cache add: fc=%p %s", fc, fd->path);
+ DEBUG_2("cache add: fc=%p %s", fc, fd->path);
fe = g_new(FileCacheEntry, 1);
fe->fd = file_data_ref(fd);
fe->size = size;
void file_cache_dump(FileCacheData *fc)
{
- GList *work;
- work = fc->list;
- guint n = 0;
+ GList *work = fc->list;
+ gulong n = 0;
+
DEBUG_1("cache dump: fc=%p max size:%ld size:%ld", fc, fc->max_size, fc->size);
while (work)
{
FileCacheData *fc = data;
- if (type == NOTIFY_TYPE_REREAD)
+ if (type & (NOTIFY_REREAD | NOTIFY_CHANGE)) /* invalidate the entry on each file change */
{
+ DEBUG_1("Notify cache: %s %04x", fd->path, type);
file_cache_remove_fd(fc, fd);
}
}
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */