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);
inode->accessed_list = bluesky_list_prepend(&inode->fs->accessed_list, inode);
g_mutex_unlock(inode->fs->lock);
fs->next_inum = BLUESKY_ROOT_INUM + 1;
fs->store = bluesky_store_new("file");
fs->flushd_lock = g_mutex_new();
+ fs->flushd_cond = g_cond_new();
fs->locations = g_hash_table_new(bluesky_cloudlog_hash,
bluesky_cloudlog_equal);
+ fs->inode_map = g_sequence_new(NULL);
fs->log_state = g_new0(BlueSkyCloudLogState, 1);
fs->log_state->data = g_string_new("");
if (fs != NULL) {
fs->store = store;
fs->log = bluesky_log_new("journal");
+ fs->log->fs = fs;
g_print("Loaded filesystem superblock\n");
g_free(fs->name);
fs->name = g_strdup(name);
BlueSkyFS *fs = bluesky_new_fs(name);
fs->store = store;
fs->log = bluesky_log_new("journal");
+ fs->log->fs = fs;
BlueSkyInode *root = bluesky_new_inode(BLUESKY_ROOT_INUM, fs,
BLUESKY_DIRECTORY);
bluesky_insert_inode(fs, root);
bluesky_inode_update_ctime(root, TRUE);
- bluesky_inode_flush(fs, root);
+ bluesky_replay(fs);
+
+ bluesky_inode_do_sync(root);
bluesky_superblock_flush(fs);
return fs;
g_atomic_int_inc(&inode->refcount);
}
+/* Free most of the resources used by an inode structure, but do not free the
+ * inode itself. Can be used if the inode data will be reloaded from
+ * serialized form to clear out old information first. */
+void bluesky_inode_free_resources(BlueSkyInode *inode)
+{
+ switch (inode->type) {
+ case BLUESKY_REGULAR:
+ if (inode->blocks != NULL) {
+ for (int i = 0; i < inode->blocks->len; i++) {
+ BlueSkyBlock *b = &g_array_index(inode->blocks,
+ BlueSkyBlock, i);
+ if (b->type == BLUESKY_BLOCK_DIRTY) {
+ g_error("Deleting an inode with dirty file data!");
+ }
+ bluesky_cloudlog_unref(b->ref);
+ bluesky_string_unref(b->dirty);
+ }
+ g_array_unref(inode->blocks);
+ inode->blocks = NULL;
+ }
+ break;
+
+ case BLUESKY_DIRECTORY:
+ if (inode->dirhash != NULL)
+ g_hash_table_destroy(inode->dirhash);
+ inode->dirhash = NULL;
+ if (inode->dirhash_folded != NULL)
+ g_hash_table_destroy(inode->dirhash_folded);
+ inode->dirhash_folded = NULL;
+ if (inode->dirents != NULL)
+ g_sequence_free(inode->dirents);
+ inode->dirents = NULL;
+ break;
+
+ case BLUESKY_SYMLINK:
+ g_free(inode->symlink_contents);
+ inode->symlink_contents = NULL;
+ break;
+
+ default:
+ break;
+ }
+}
+
void bluesky_inode_unref(BlueSkyInode *inode)
{
if (g_atomic_int_dec_and_test(&inode->refcount)) {
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
- * dirty data to commit when the reference count has reaches zero. */
- switch (inode->type) {
- case 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_DIRTY) {
- g_error("Deleting an inode with dirty file data!");
- }
- g_free(b->ref);
- bluesky_string_unref(b->data);
- }
- g_array_unref(inode->blocks);
- break;
-
- case BLUESKY_DIRECTORY:
- g_hash_table_destroy(inode->dirhash);
- g_hash_table_destroy(inode->dirhash_folded);
- g_sequence_free(inode->dirents);
- break;
-
- case BLUESKY_SYMLINK:
- g_free(inode->symlink_contents);
- break;
-
- default:
- break;
- }
+ bluesky_inode_free_resources(inode);
g_mutex_free(inode->lock);
-
g_free(inode);
}
}
g_hash_table_insert(fs->inodes, &inode->inum, inode);
}
-/* 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)
+void bluesky_inode_start_sync(BlueSkyInode *inode)
{
GList *log_items = NULL;
- BlueSkyFS *fs = inode->fs;
if (inode->type == BLUESKY_REGULAR)
- bluesky_file_flush(inode, barrier, &log_items);
+ bluesky_file_flush(inode, &log_items);
- GString *buf = g_string_new("");
- bluesky_serialize_inode(buf, inode);
- BlueSkyRCStr *data = bluesky_string_new_from_gstring(buf);
+ BlueSkyCloudLog *cloudlog = bluesky_serialize_inode(inode);
- char key[64];
- sprintf(key, "inode-%016"PRIx64, inode->inum);
-
- BlueSkyCloudLog *cloudlog = bluesky_cloudlog_new(fs);
- cloudlog->type = LOGTYPE_INODE;
- cloudlog->inum = inode->inum;
- cloudlog->data = data;
- bluesky_string_ref(data);
-
- 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_unref(inode->committed_item);
+ inode->committed_item = cloudlog;
- bluesky_cloudlog_insert(cloudlog);
+ bluesky_cloudlog_sync(cloudlog);
+ bluesky_cloudlog_ref(cloudlog);
+ log_items = g_list_prepend(log_items, 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);
- }
+ bluesky_log_finish_all(log_items);
- 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);
+ /* Mark the inode as clean */
+ inode->change_commit = inode->change_count;
+ inode->change_time = 0;
+ g_mutex_lock(inode->fs->lock);
+ bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list);
+ inode->unlogged_list = NULL;
+
+ /* Since a new version of the inode has been written to the log, also
+ * schedule a future flush of the new data to cloud storage. */
+ bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
+ inode->dirty_list = bluesky_list_prepend(&inode->fs->dirty_list, inode);
+ inode->change_cloud = inode->change_count;
+
+ g_mutex_unlock(inode->fs->lock);
}
/* Write back an inode and all associated data and wait for completion. Inode
* should already be locked. */
void bluesky_inode_do_sync(BlueSkyInode *inode)
{
- BlueSkyStoreAsync *barrier = bluesky_store_async_new(inode->fs->store);
- barrier->op = STORE_OP_BARRIER;
-
if (bluesky_verbose) {
g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
"Synchronous writeback for inode %"PRIu64"...", inode->inum);
}
- bluesky_inode_start_sync(inode, barrier);
- bluesky_store_async_submit(barrier);
- bluesky_store_async_wait(barrier);
- bluesky_store_async_unref(barrier);
+ bluesky_inode_start_sync(inode);
if (bluesky_verbose) {
g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
"Writeback for inode %"PRIu64" complete", inode->inum);
"Completing fetch of inode %"PRIu64"...", inode->inum);
}
- if (async->result != 0
- || !bluesky_deserialize_inode(inode, async->data->data))
+ if (async->result != 0 || FALSE)
{
if (bluesky_verbose) {
g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
/* Synchronize filesystem superblock to stable storage. */
void bluesky_superblock_flush(BlueSkyFS *fs)
{
+#if 0
GString *buf = g_string_new("");
bluesky_serialize_superblock(buf, fs);
BlueSkyRCStr *data = bluesky_string_new_from_gstring(buf);
bluesky_store_async_unref(async);
//bluesky_store_sync(fs->store);
+#endif
}
projects / bluesky.git / blobdiff