X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Finode.c;h=b4b363c71030dd13a34437051ca3b1fc2531ad35;hb=bf1b396c85d03f9c16eee6cd84c71c82503c3ec4;hp=e11bfeb3c0a8b898387f295ffdb4e146b9db93b4;hpb=0a021d1c28cff9cbaa4c127a837816f96dd37a27;p=bluesky.git

diff --git a/bluesky/inode.c b/bluesky/inode.c
index e11bfeb..b4b363c 100644
--- a/bluesky/inode.c
+++ b/bluesky/inode.c
@@ -14,6 +14,8 @@
 
 #include "bluesky-private.h"
 
+static void inode_fetch_task(gpointer a, gpointer b);
+
 /* 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
  * implement an in-memory filesystem, but eventually this will be state which
@@ -94,12 +96,21 @@ BlueSkyFS *bluesky_new_fs(gchar *name)
     fs->log_state = g_new0(BlueSkyCloudLogState, 1);
     fs->log_state->data = g_string_new("");
 
+    bluesky_cloudlog_threads_init(fs);
+    fs->inode_fetch_thread_pool = g_thread_pool_new(inode_fetch_task, NULL,
+                                                    bluesky_max_threads,
+                                                    FALSE, NULL);
+
     return fs;
 }
 
-BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store)
+BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store,
+                           const gchar *master_key)
 {
     BlueSkyFS *fs = bluesky_new_fs(name);
+    fs->master_key = g_strdup(master_key);
+    fs->keys = g_new(BlueSkyCryptKeys, 1);
+    bluesky_crypt_derive_keys(fs->keys, master_key);
     fs->store = store;
     fs->log = bluesky_log_new("journal");
     fs->log->fs = fs;
@@ -344,11 +355,13 @@ void bluesky_inode_do_sync(BlueSkyInode *inode)
     }
 }
 
-static void complete_inode_fetch(BlueSkyInode *inode)
+static void inode_fetch_task(gpointer a, gpointer b)
 {
+    BlueSkyInode *inode = (BlueSkyInode *)a;
+
     BlueSkyCloudLog *item = inode->committed_item;
     inode->committed_item = NULL;
-    g_print("Completing fetch of inode %"PRIu64"...", inode->inum);
+    g_print("Completing fetch of inode %"PRIu64"...\n", inode->inum);
 
     g_mutex_lock(item->lock);
     bluesky_cloudlog_fetch(item);
@@ -378,15 +391,18 @@ void bluesky_inode_fetch(BlueSkyFS *fs, uint64_t inum)
     if (entry == NULL)
         return;
 
+    /* Non-portable behavior: We take the inode lock here, and release it in
+     * the fetching thread.  This works with the default Linux pthreads
+     * implementation but is not guaranteed. */
+
     BlueSkyInode *inode = bluesky_new_inode(inum, fs, BLUESKY_PENDING);
     inode->change_count = 0;
     bluesky_inode_ref(inode);       // Extra ref held by fetching process
     g_mutex_lock(inode->lock);
-    bluesky_insert_inode(fs, inode);
+
     inode->committed_item = entry->item;
     bluesky_cloudlog_ref(entry->item);
+    bluesky_insert_inode(fs, inode);
 
-    /* TODO: Thread pool or other better async method. */
-    g_thread_create((GThreadFunc)complete_inode_fetch,
-                    (gpointer)inode, FALSE, NULL);
+    g_thread_pool_push(fs->inode_fetch_thread_pool, inode, NULL);
 }