* memory-mapped from log file or similar, so the kernel can drop this clean
* data from memory for us and hence memory management isn't too important.
* Mainly, we'll want to drop references to data that hasn't been accessed in a
- * while so that it is possible to reclaim log segments on disk. */
-static void flushd_clean(BlueSkyFS *fs)
+ * while so that it is possible to reclaim log segments on disk.
+ *
+ * If aggressive is set, try much harder to drop data from the caches to free
+ * up space. */
+static void flushd_clean(BlueSkyFS *fs, int aggressive)
{
g_mutex_lock(fs->lock);
inode = fs->accessed_list.prev->data;
uint64_t elapsed = bluesky_get_current_time() - inode->access_time;
- if (elapsed < CACHE_DROP_DELAY)
+ if (elapsed < CACHE_DROP_DELAY && !aggressive)
break;
if (bluesky_verbose) {
* then we'll just skip the file on this pass. */
if (g_mutex_trylock(cachefile->lock)) {
int64_t age = bluesky_get_current_time() - cachefile->atime;
- g_print("%s addr=%p mapcount=%d refcount=%d atime_age=%f",
+ g_print("%s addr=%p mapcount=%d refcount=%d size=%d atime_age=%f",
cachefile->filename, cachefile->addr, cachefile->mapcount,
- cachefile->refcount, age / 1e6);
+ cachefile->refcount, cachefile->disk_used, age / 1e6);
if (cachefile->fetching)
g_print(" (fetching)");
g_print("\n");
cachefile->filename);
}
- g_atomic_int_add(&fs->log->disk_used, -(cachefile->len / 1024));
+ g_atomic_int_add(&fs->log->disk_used, -cachefile->disk_used);
g_hash_table_remove(fs->log->mmap_cache, cachefile->filename);
+ bluesky_rangeset_free(cachefile->items);
+ if (cachefile->prefetches != NULL)
+ bluesky_rangeset_free(cachefile->prefetches);
g_mutex_unlock(cachefile->lock);
g_mutex_free(cachefile->lock);
g_cond_free(cachefile->cond);
files = g_list_delete_link(files, files);
}
g_list_free(files);
+ g_print("\nEnding cache size: %d kB\n", fs->log->disk_used);
g_mutex_unlock(fs->log->mmap_lock);
}
flushd_dirty(fs);
flushd_cloud(fs);
- flushd_clean(fs);
+ flushd_clean(fs, 0);
bluesky_cachefile_gc(fs);
+
+ /* If running out of disk cache space, make another more aggressive pass to
+ * free up space. */
+ if (g_atomic_int_get(&fs->log->disk_used) > bluesky_options.cache_size) {
+ g_print("Still short on disk space, trying again to free space...\n");
+ flushd_clean(fs, 1);
+ bluesky_cachefile_gc(fs);
+ }
+
g_mutex_unlock(fs->flushd_lock);
return NULL;