X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;h=e53c602781ffff51d962ee89014e05838d04298d;hb=7298b7a416aed5be1b82b54015c6944b9379eee6;hp=4f970fe6f9ec92031f7bed8c3ca79a9dd7df483e;hpb=d3c7929485ee2a0637e8fce739bad597ce11253d;p=bluesky.git

diff --git a/bluesky/inode.c b/bluesky/inode.c
index 4f970fe..e53c602 100644
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -42,8 +42,10 @@ void bluesky_inode_update_ctime(BlueSkyInode *inode, gboolean update_mtime)
     if (inode->change_time == 0)
         inode->change_time = now;
 
+#if 0
     if (bluesky_options.writethrough_cache)
         bluesky_file_flush(inode, NULL);
+#endif
 
     g_mutex_lock(inode->fs->lock);
     bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
@@ -95,6 +97,7 @@ BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store)
         BlueSkyFS *fs = bluesky_deserialize_superblock(data->data);
         if (fs != NULL) {
             fs->store = store;
+            fs->log = bluesky_log_new("journal");
             g_print("Loaded filesystem superblock\n");
             g_free(fs->name);
             fs->name = g_strdup(name);
@@ -106,6 +109,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 +133,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
@@ -293,10 +300,11 @@ void bluesky_inode_flush(BlueSkyFS *fs, BlueSkyInode *inode)
 /* Start writeback of an inode and all associated data. */
 void bluesky_inode_start_sync(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
 {
+    GList *log_items = NULL;
     BlueSkyFS *fs = inode->fs;
 
     if (inode->type == BLUESKY_REGULAR)
-        bluesky_file_flush(inode, barrier);
+        bluesky_file_flush(inode, barrier, &log_items);
 
     GString *buf = g_string_new("");
     bluesky_serialize_inode(buf, inode);
@@ -305,6 +313,20 @@ 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);
+    log_items = g_list_prepend(log_items, log_item);
+
+    /* Wait for all log items to be committed to disk. */
+    while (log_items != NULL) {
+        log_item = (BlueSkyLogItem *)log_items->data;
+        bluesky_log_item_finish(log_item);
+        log_items = g_list_delete_link(log_items, log_items);
+    }
+
     BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
     async->op = STORE_OP_PUT;
     async->key = g_strdup(key);
@@ -322,32 +344,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);
 
@@ -399,5 +434,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);
 }