X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;h=745d81bb7d2c01e8276ed61b0d298f7134c235df;hb=db4915b4f7fc8f74958c4d1891dc69b76cbbe383;hp=a0b3c6a90d6bddb858626eee0109cccdf06cb317;hpb=0ba2a52ec1386c8928b397f775e4a4f97339fa2a;p=bluesky.git

diff --git a/bluesky/inode.c b/bluesky/inode.c
index a0b3c6a..745d81b 100644
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -42,10 +42,14 @@ 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->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);
@@ -84,6 +88,11 @@ 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);
+
+    fs->log_state = g_new0(BlueSkyCloudLogState, 1);
+    fs->log_state->data = g_string_new("");
 
     return fs;
 }
@@ -95,6 +104,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);
@@ -139,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);
         }
@@ -149,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
@@ -297,10 +309,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);
@@ -309,12 +322,34 @@ 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;
+    BlueSkyCloudLog *cloudlog = bluesky_cloudlog_new(fs);
+    cloudlog->type = LOGTYPE_INODE;
+    cloudlog->inum = inode->inum;
+    cloudlog->data = data;
     bluesky_string_ref(data);
-    bluesky_log_item_submit(log_item, fs->log);
-    bluesky_log_item_finish(log_item);
+
+    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);
+            }
+        }
+    }
+
+    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;