X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;h=bdf01a1240ff53ab3691bd372465f6a188cd0fad;hb=ffadf57d27b07d5ba8c0de11649ff08e999f53f4;hp=cc4dc3c984d8e2143f27e06b51f0963a4c216ed1;hpb=98e3e399a5cce3d1dd1b2a15d5746d1988943e7f;p=bluesky.git

diff --git a/bluesky/inode.c b/bluesky/inode.c
index cc4dc3c..bdf01a1 100644
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -12,7 +12,7 @@
 #include <glib.h>
 #include <string.h>
 
-#include "bluesky.h"
+#include "bluesky-private.h"
 
 /* Core filesystem.  Different proxies, such as the NFSv3 one, interface to
  * this, but the core actually tracks the data which is stored.  So far we just
@@ -29,7 +29,8 @@ int64_t bluesky_get_current_time()
 
 /* Update an inode to indicate that a modification was made.  This increases
  * the change counter, updates the ctime to the current time, and optionally
- * updates the mtime.  inode must already be locked. */
+ * updates the mtime.  This also makes the inode contents subject to writeback
+ * to storage in the future.  inode must already be locked. */
 void bluesky_inode_update_ctime(BlueSkyInode *inode, gboolean update_mtime)
 {
     int64_t now = bluesky_get_current_time();
@@ -37,6 +38,9 @@ void bluesky_inode_update_ctime(BlueSkyInode *inode, gboolean update_mtime)
     inode->ctime = now;
     if (update_mtime)
         inode->mtime = now;
+
+    if (inode->change_time == 0)
+        inode->change_time = now;
 }
 
 /* Unfortunately a glib hash table is only guaranteed to be able to store
@@ -170,6 +174,10 @@ BlueSkyInode *bluesky_get_inode(BlueSkyFS *fs, uint64_t inum)
 {
     BlueSkyInode *inode = NULL;
 
+    if (inum == 0) {
+        return NULL;
+    }
+
     g_mutex_lock(fs->lock);
     inode = (BlueSkyInode *)g_hash_table_lookup(fs->inodes, &inum);
 
@@ -193,19 +201,47 @@ void bluesky_insert_inode(BlueSkyFS *fs, BlueSkyInode *inode)
     g_hash_table_insert(fs->inodes, &inode->inum, inode);
 }
 
-/* Synchronize an inode to stable storage. */
+/* 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)
+{
+    BlueSkyFS *fs = inode->fs;
+
+    GString *buf = g_string_new("");
+    bluesky_serialize_inode(buf, inode);
+    BlueSkyRCStr *data = bluesky_string_new_from_gstring(buf);
 
-    gsize len = buf->len;
-    BlueSkyRCStr *data = bluesky_string_new(g_string_free(buf, FALSE), len);
+    if (inode->type == BLUESKY_REGULAR)
+        bluesky_file_flush(inode, barrier);
 
     char key[64];
     sprintf(key, "inode-%016"PRIx64, inode->inum);
 
-    bluesky_store_put(fs->store, key, data);
+    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);
 }
 
 /* Fetch an inode from stable storage. */
@@ -220,7 +256,6 @@ void bluesky_inode_fetch(BlueSkyFS *fs, uint64_t inum)
     BlueSkyInode *inode = bluesky_deserialize_inode(fs, data->data);
     if (inode != NULL) {
         bluesky_insert_inode(fs, inode);
-        g_print("Loaded inode %"PRIu64"\n", inum);
     }
 }
 
@@ -229,11 +264,14 @@ void bluesky_superblock_flush(BlueSkyFS *fs)
 {
     GString *buf = g_string_new("");
     bluesky_serialize_superblock(buf, fs);
+    BlueSkyRCStr *data = bluesky_string_new_from_gstring(buf);
 
-    g_print("Syncing superblock...\n");
+    BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
+    async->op = STORE_OP_PUT;
+    async->key = g_strdup("superblock");
+    async->data = data;
+    bluesky_store_async_submit(async);
+    bluesky_store_async_unref(async);
 
-    gsize len = buf->len;
-    BlueSkyRCStr *data = bluesky_string_new(g_string_free(buf, FALSE), len);
-    bluesky_store_put(fs->store, "superblock", data);
+    bluesky_store_sync(fs->store);
 }
-