X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fcache.c;h=16e3d8162d21561974cd9e1f54a8ee153ba7d8ba;hb=59dcd584eb785bf5345ce8f4c6468c8f2f05630d;hp=bfbfe3c2bd87fe6deddeb9d1cab4ec31269d6030;hpb=38a7cd8d63ba82a8175f8e43a18a96b6188fd1a9;p=bluesky.git

diff --git a/bluesky/cache.c b/bluesky/cache.c
index bfbfe3c..16e3d81 100644
--- a/bluesky/cache.c
+++ b/bluesky/cache.c
@@ -328,12 +328,14 @@ void bluesky_cachefile_gc(BlueSkyFS *fs)
          * 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",
-                    cachefile->filename, cachefile->addr, cachefile->mapcount,
-                    cachefile->refcount, age / 1e6);
-            if (cachefile->fetching)
-                g_print(" (fetching)");
-            g_print("\n");
+            if (bluesky_verbose) {
+                g_print("%s addr=%p mapcount=%d refcount=%d size=%d atime_age=%f",
+                        cachefile->filename, cachefile->addr, cachefile->mapcount,
+                        cachefile->refcount, cachefile->disk_used, age / 1e6);
+                if (cachefile->fetching)
+                    g_print(" (fetching)");
+                g_print("\n");
+            }
 
             gboolean deletion_candidate = FALSE;
             if (g_atomic_int_get(&fs->log->disk_used)
@@ -353,14 +355,19 @@ void bluesky_cachefile_gc(BlueSkyFS *fs)
             }
 
             if (deletion_candidate) {
-                g_print("   ...deleting\n");
+                if (bluesky_verbose) {
+                    g_print("   ...deleting\n");
+                }
                 if (unlinkat(fs->log->dirfd, cachefile->filename, 0) < 0) {
                     fprintf(stderr, "Unable to unlink journal %s: %m\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);