#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
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;
if (bluesky_checkpoint_load(fs)) {
g_print("Filesystem checkpoint loaded, starting journal replay...\n");
- //bluesky_replay(fs);
+ bluesky_replay(fs);
g_print("Journal replay complete, filesystem ready.\n");
} else {
/* Initialize a fresh filesystem */
}
}
-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);
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);
}