X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;h=f3b804dc4e7f5378b08227b8ad22d8a7a5545f64;hb=ddaec40a37a5e65e53546b14632b1b0b35613264;hp=27802536d64bf1365e8dbce38beac26f49a91020;hpb=60b4792d65ba4b2a45733894f6a57e6581ddc487;p=bluesky.git

diff --git a/bluesky/inode.c b/bluesky/inode.c
index 2780253..f3b804d 100644
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -48,6 +48,8 @@ void bluesky_inode_update_ctime(BlueSkyInode *inode, gboolean update_mtime)
 #endif
 
     g_mutex_lock(inode->fs->lock);
+    bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list);
+    inode->unlogged_list = bluesky_list_prepend(&inode->fs->unlogged_list, inode);
     bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
     inode->dirty_list = bluesky_list_prepend(&inode->fs->dirty_list, inode);
     bluesky_list_unlink(&inode->fs->accessed_list, inode->accessed_list);
@@ -89,6 +91,9 @@ BlueSkyFS *bluesky_new_fs(gchar *name)
     fs->locations = g_hash_table_new(bluesky_cloudlog_hash,
                                      bluesky_cloudlog_equal);
 
+    fs->log_state = g_new0(BlueSkyCloudLogState, 1);
+    fs->log_state->data = g_string_new("");
+
     return fs;
 }
 
@@ -120,7 +125,7 @@ BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store)
     bluesky_insert_inode(fs, root);
     bluesky_inode_update_ctime(root, TRUE);
 
-    bluesky_inode_flush(fs, root);
+    bluesky_inode_do_sync(root);
     bluesky_superblock_flush(fs);
 
     return fs;
@@ -144,6 +149,7 @@ void bluesky_inode_unref(BlueSkyInode *inode)
         /* Sanity check: Is the inode clean? */
         if (inode->change_commit < inode->change_count
                 || inode->accessed_list != NULL
+                || inode->unlogged_list != NULL
                 || inode->dirty_list != NULL) {
             g_warning("Dropping inode which is not clean (commit %"PRIi64" < change %"PRIi64"; accessed_list = %p; dirty_list = %p)\n", inode->change_commit, inode->change_count, inode->accessed_list, inode->dirty_list);
         }
@@ -154,6 +160,7 @@ void bluesky_inode_unref(BlueSkyInode *inode)
         g_mutex_lock(inode->fs->lock);
         bluesky_list_unlink(&inode->fs->accessed_list, inode->accessed_list);
         bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
+        bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list);
         g_mutex_unlock(inode->fs->lock);
 
         /* Free file type specific data.  It should be an error for there to be
@@ -166,8 +173,8 @@ void bluesky_inode_unref(BlueSkyInode *inode)
                 if (b->type == BLUESKY_BLOCK_DIRTY) {
                     g_error("Deleting an inode with dirty file data!");
                 }
-                g_free(b->ref);
-                bluesky_string_unref(b->data);
+                bluesky_cloudlog_unref(b->ref);
+                bluesky_string_unref(b->dirty);
             }
             g_array_unref(inode->blocks);
             break;
@@ -281,94 +288,44 @@ void bluesky_insert_inode(BlueSkyFS *fs, BlueSkyInode *inode)
     g_hash_table_insert(fs->inodes, &inode->inum, inode);
 }
 
-/* Deprecated: Synchronize an inode to stable storage. */
-void bluesky_inode_flush(BlueSkyFS *fs, BlueSkyInode *inode)
-{
-    GString *buf = g_string_new("");
-    bluesky_serialize_inode(buf, inode);
-    BlueSkyRCStr *data = bluesky_string_new_from_gstring(buf);
-
-    char key[64];
-    sprintf(key, "inode-%016"PRIx64, inode->inum);
-
-    BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
-    async->op = STORE_OP_PUT;
-    async->key = g_strdup(key);
-    async->data = data;
-    bluesky_store_async_submit(async);
-    bluesky_store_async_unref(async);
-}
-
 /* Start writeback of an inode and all associated data. */
-void bluesky_inode_start_sync(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
+void bluesky_inode_start_sync(BlueSkyInode *inode)
 {
     GList *log_items = NULL;
-    BlueSkyFS *fs = inode->fs;
 
     if (inode->type == BLUESKY_REGULAR)
-        bluesky_file_flush(inode, barrier, &log_items);
-
-    GString *buf = g_string_new("");
-    bluesky_serialize_inode(buf, inode);
-    BlueSkyRCStr *data = bluesky_string_new_from_gstring(buf);
+        bluesky_file_flush(inode, &log_items);
 
-    char key[64];
-    sprintf(key, "inode-%016"PRIx64, inode->inum);
-
-    BlueSkyCloudLog *cloudlog = bluesky_cloudlog_new(fs);
-    cloudlog->type = LOGTYPE_INODE;
-    cloudlog->inum = inode->inum;
-    cloudlog->data = data;
-    bluesky_string_ref(data);
-
-    if (inode->type == BLUESKY_REGULAR) {
-        for (int i = 0; i < inode->blocks->len; i++) {
-            BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
-            if (b->type == BLUESKY_BLOCK_CACHED
-                || b->type == BLUESKY_BLOCK_REF)
-            {
-                BlueSkyCloudID id = bluesky_cloudlog_id_from_string(b->ref);
-                g_array_append_val(cloudlog->pointers, id);
-            }
-        }
-    }
+    BlueSkyCloudLog *cloudlog = bluesky_serialize_inode(inode);
 
-    log_items = g_list_prepend(log_items, bluesky_cloudlog_sync(cloudlog));
+    bluesky_cloudlog_unref(inode->committed_item);
+    inode->committed_item = cloudlog;
 
-    bluesky_cloudlog_insert(cloudlog);
+    bluesky_cloudlog_sync(cloudlog);
+    bluesky_cloudlog_ref(cloudlog);
+    log_items = g_list_prepend(log_items, cloudlog);
 
     /* Wait for all log items to be committed to disk. */
-    while (log_items != NULL) {
-        BlueSkyLogItem *log_item = (BlueSkyLogItem *)log_items->data;
-        bluesky_log_item_finish(log_item);
-        log_items = g_list_delete_link(log_items, log_items);
-    }
+    bluesky_log_finish_all(log_items);
 
-    BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
-    async->op = STORE_OP_PUT;
-    async->key = g_strdup(key);
-    async->data = data;
-    bluesky_store_async_submit(async);
-    if (barrier != NULL)
-        bluesky_store_add_barrier(barrier, async);
-    bluesky_store_async_unref(async);
+    /* Mark the inode as clean */
+    inode->change_commit = inode->change_count;
+    inode->change_time = 0;
+    g_mutex_lock(inode->fs->lock);
+    bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list);
+    inode->unlogged_list = NULL;
+    g_mutex_unlock(inode->fs->lock);
 }
 
 /* Write back an inode and all associated data and wait for completion.  Inode
  * should already be locked. */
 void bluesky_inode_do_sync(BlueSkyInode *inode)
 {
-    BlueSkyStoreAsync *barrier = bluesky_store_async_new(inode->fs->store);
-    barrier->op = STORE_OP_BARRIER;
-
     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);
+    bluesky_inode_start_sync(inode);
     if (bluesky_verbose) {
         g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
               "Writeback for inode %"PRIu64" complete", inode->inum);
@@ -440,6 +397,7 @@ void bluesky_inode_fetch(BlueSkyFS *fs, uint64_t inum)
 /* Synchronize filesystem superblock to stable storage. */
 void bluesky_superblock_flush(BlueSkyFS *fs)
 {
+#if 0
     GString *buf = g_string_new("");
     bluesky_serialize_superblock(buf, fs);
     BlueSkyRCStr *data = bluesky_string_new_from_gstring(buf);
@@ -452,4 +410,5 @@ void bluesky_superblock_flush(BlueSkyFS *fs)
     bluesky_store_async_unref(async);
 
     //bluesky_store_sync(fs->store);
+#endif
 }