Basic filesystem journaling.

[bluesky.git] / bluesky / inode.c

diff --git a/bluesky/inode.c b/bluesky/inode.c
index 1c89c29..a0b3c6a 100644 (file)
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -106,6 +106,7 @@ BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store)
     g_print("Initializing fresh filesystem\n");
     BlueSkyFS *fs = bluesky_new_fs(name);
     fs->store = store;
+    fs->log = bluesky_log_new("journal");
 
     BlueSkyInode *root = bluesky_new_inode(BLUESKY_ROOT_INUM, fs,
                                            BLUESKY_DIRECTORY);
@@ -129,8 +130,11 @@ void bluesky_inode_ref(BlueSkyInode *inode)
 void bluesky_inode_unref(BlueSkyInode *inode)
 {
     if (g_atomic_int_dec_and_test(&inode->refcount)) {
-        g_print("Reference count for inode %"PRIu64" dropped to zero.\n",
-                inode->inum);
+        if (bluesky_verbose) {
+            g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
+                  "Reference count for inode %"PRIu64" dropped to zero.",
+                  inode->inum);
+        }
 
         /* Sanity check: Is the inode clean? */
         if (inode->change_commit < inode->change_count
@@ -305,6 +309,13 @@ void bluesky_inode_start_sync(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
     char key[64];
     sprintf(key, "inode-%016"PRIx64, inode->inum);
 
+    BlueSkyLogItem *log_item = bluesky_log_item_new();
+    log_item->key = g_strdup(key);
+    log_item->data = data;
+    bluesky_string_ref(data);
+    bluesky_log_item_submit(log_item, fs->log);
+    bluesky_log_item_finish(log_item);
+
     BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
     async->op = STORE_OP_PUT;
     async->key = g_strdup(key);
@@ -322,32 +333,45 @@ void bluesky_inode_do_sync(BlueSkyInode *inode)
     BlueSkyStoreAsync *barrier = bluesky_store_async_new(inode->fs->store);
     barrier->op = STORE_OP_BARRIER;
 
-    g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
-          "Synchronous writeback for inode %"PRIu64"...", inode->inum);
+    if (bluesky_verbose) {
+        g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
+            "Synchronous writeback for inode %"PRIu64"...", inode->inum);
+    }
     bluesky_inode_start_sync(inode, barrier);
     bluesky_store_async_submit(barrier);
     bluesky_store_async_wait(barrier);
     bluesky_store_async_unref(barrier);
-    g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
-          "Writeback for inode %"PRIu64" complete", inode->inum);
+    if (bluesky_verbose) {
+        g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
+              "Writeback for inode %"PRIu64" complete", inode->inum);
+    }
 }
 
 static void complete_inode_fetch(BlueSkyStoreAsync *async, BlueSkyInode *inode)
 {
-    g_print("Completing fetch of inode %"PRIu64"...\n", inode->inum);
+    if (bluesky_verbose) {
+        g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
+              "Completing fetch of inode %"PRIu64"...", inode->inum);
+    }
 
     if (async->result != 0
         || !bluesky_deserialize_inode(inode, async->data->data))
     {
-        g_print("    failed to load inode, cleaning up\n");
+        if (bluesky_verbose) {
+            g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
+                  "    failed to load inode, cleaning up");
+        }
         g_mutex_lock(inode->fs->lock);
         g_hash_table_remove(inode->fs->inodes, &inode->inum);
+        bluesky_list_unlink(&inode->fs->accessed_list, inode->accessed_list);
+        inode->accessed_list = NULL;
         g_mutex_unlock(inode->fs->lock);
         bluesky_inode_unref(inode);
     }
 
     inode->access_time = bluesky_get_current_time();
     g_mutex_lock(inode->fs->lock);
+    bluesky_list_unlink(&inode->fs->accessed_list, inode->accessed_list);
     inode->accessed_list = bluesky_list_prepend(&inode->fs->accessed_list, inode);
     g_mutex_unlock(inode->fs->lock);
 
@@ -366,7 +390,7 @@ void bluesky_inode_fetch(BlueSkyFS *fs, uint64_t inum)
     sprintf(key, "inode-%016"PRIx64, inum);
 
     BlueSkyInode *inode = bluesky_new_inode(inum, fs, BLUESKY_PENDING);
-    i->change_count = 0;
+    inode->change_count = 0;
     bluesky_inode_ref(inode);       // Extra ref held by fetching process
     g_mutex_lock(inode->lock);
     bluesky_insert_inode(fs, inode);
@@ -399,5 +423,5 @@ void bluesky_superblock_flush(BlueSkyFS *fs)
     bluesky_store_async_submit(async);
     bluesky_store_async_unref(async);
 
-    bluesky_store_sync(fs->store);
+    //bluesky_store_sync(fs->store);
 }