X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;h=3e8d686f2d46979a3479d38cacc5a8e4e008d42c;hb=810fdc7bdf0cd13aaa7c88d3c5af5aae24e77254;hp=e15d5b74667f16fb1187fbb964ef907db810f31b;hpb=966a43ffed492d387e0d75e56c3984d9001c15b1;p=bluesky.git

diff --git a/bluesky/inode.c b/bluesky/inode.c
index e15d5b7..3e8d686 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);
@@ -84,6 +86,8 @@ BlueSkyFS *bluesky_new_fs(gchar *name)
     fs->next_inum = BLUESKY_ROOT_INUM + 1;
     fs->store = bluesky_store_new("file");
     fs->flushd_lock = g_mutex_new();
+    fs->locations = g_hash_table_new(bluesky_cloudlog_hash,
+                                     bluesky_cloudlog_equal);
 
     return fs;
 }
@@ -95,6 +99,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 +111,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);
@@ -296,10 +302,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);
@@ -308,6 +315,23 @@ void bluesky_inode_start_sync(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
     char key[64];
     sprintf(key, "inode-%016"PRIx64, inode->inum);
 
+    BlueSkyCloudLog *cloudlog = bluesky_cloudlog_new(fs);
+    cloudlog->type = LOGTYPE_DATA;
+    cloudlog->inum = inode->inum;
+    cloudlog->data = data;
+    bluesky_string_ref(data);
+
+    log_items = g_list_prepend(log_items, bluesky_cloudlog_sync(cloudlog));
+
+    bluesky_cloudlog_insert(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);
+    }
+
     BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
     async->op = STORE_OP_PUT;
     async->key = g_strdup(key);
@@ -415,5 +439,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);
 }