Improve tracking of memory usage in BlueSky.

[bluesky.git] / bluesky / debug.c

diff --git a/bluesky/debug.c b/bluesky/debug.c
index ca09868..43b29be 100644 (file)
--- a/bluesky/debug.c
+++ b/bluesky/debug.c
@@ -31,8 +31,9 @@ static void inode_dump(gpointer key, gpointer value, gpointer user_data)
             locked ? 'T' : 'F', inode->refcount);
 
     g_print("    Type: %d   Mode: %o\n", inode->type, inode->mode);
-    g_print("    change_count = %"PRIu64", change_commit = %"PRIu64"\n",
-            inode->change_count, inode->change_commit);
+    g_print("    change_count = %"PRIu64", change_commit = %"PRIu64", "
+            "change_cloud = %"PRIu64"\n",
+            inode->change_count, inode->change_commit, inode->change_cloud);
 }
 
 static void cloudlog_dump(gpointer key, gpointer value, gpointer user_data)
@@ -42,19 +43,26 @@ static void cloudlog_dump(gpointer key, gpointer value, gpointer user_data)
     for (int i = 0; i < sizeof(BlueSkyCloudID); i++) {
         g_print("%02x", (uint8_t)(log->id.bytes[i]));
     }
-    g_print(": ty=%d inode=%"PRIu64" locs=%x\n",
-            log->type, log->inum, log->location_flags);
+    g_print(": refs=%d ty=%d inode=%"PRIu64" locs=%x log@(%d,%d) cloud@(%d,%d,%d)\n",
+            log->refcount,
+            log->type, log->inum,
+            log->location_flags | (log->data != NULL ? 0x100 : 0),
+            log->log_seq, log->log_offset, log->location.directory,
+            log->location.sequence, log->location.offset);
 }
 
 /* Dump a summary of filesystem state as it is cached in memory. */
 void bluesky_debug_dump(BlueSkyFS *fs)
 {
     g_print("*** DEBUG DUMP FOR FILESYSTEM %s ***\n", fs->name);
-    g_print("Cached blocks: %d\tDirty blocks: %d\n",
-            g_atomic_int_get(&fs->cache_total),
-            g_atomic_int_get(&fs->cache_dirty));
+    g_print("Dirty blocks: %d\n", g_atomic_int_get(&fs->cache_dirty));
     g_print("Cached inodes: %u\tNext inode: %"PRIu64"\n",
             g_hash_table_size(fs->inodes), fs->next_inum);
+    g_print("Cloudlog cache: %d dirty, %d writeback, %d journal, %d cloud\n",
+            g_atomic_int_get(&fs->cache_log_dirty),
+            g_atomic_int_get(&fs->cache_log_writeback),
+            g_atomic_int_get(&fs->cache_log_journal),
+            g_atomic_int_get(&fs->cache_log_cloud));
 
     GList *item;
     g_print("Unsynced inode list:");