block->data = bluesky_string_new(g_malloc0(block_len), block_len);
break;
case BLUESKY_BLOCK_REF:
- bluesky_block_fetch(inode->fs, block, NULL);
+ bluesky_block_fetch(inode, block, NULL);
g_assert(block->type == BLUESKY_BLOCK_CACHED);
/* Fall through */
case BLUESKY_BLOCK_CACHED:
g_atomic_int_add(&inode->fs->cache_dirty, 1);
block->type = BLUESKY_BLOCK_DIRTY;
+ if (block->cloudref != NULL)
+ bluesky_cloudlog_unref(block->cloudref);
+ block->cloudref = NULL;
}
/* Set the size of a file. This will truncate or extend the file as needed.
/* Delete blocks from a file. Must reclaim memory. */
for (guint i = inode->blocks->len; i < blocks; i++) {
BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
- g_free(b->ref);
if (b->type == BLUESKY_BLOCK_CACHED
|| b->type == BLUESKY_BLOCK_DIRTY)
g_atomic_int_add(&inode->fs->cache_total, -1);
if (b->type == BLUESKY_BLOCK_DIRTY)
g_atomic_int_add(&inode->fs->cache_dirty, -1);
bluesky_string_unref(b->data);
+ bluesky_cloudlog_unref(b->cloudref);
}
g_array_set_size(inode->blocks, blocks);
}
BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock,
i);
if (b->type == BLUESKY_BLOCK_REF)
- bluesky_block_fetch(inode->fs, b, barrier);
+ bluesky_block_fetch(inode, b, barrier);
}
bluesky_store_async_submit(barrier);
bluesky_store_async_wait(barrier);
memset(buf, 0, bytes);
break;
case BLUESKY_BLOCK_REF:
- bluesky_block_fetch(inode->fs, b, NULL);
+ bluesky_block_fetch(inode, b, NULL);
/* Fall through */
case BLUESKY_BLOCK_CACHED:
case BLUESKY_BLOCK_DIRTY:
}
}
-/* Read the given block from cloud-backed storage if the data is not already
- * cached. */
-static void block_fetch_completion(BlueSkyStoreAsync *async, gpointer data)
-{
- BlueSkyBlock *block = (BlueSkyBlock *)data;
-
- bluesky_string_unref(block->data);
- block->data = async->data;
- bluesky_string_ref(block->data);
- block->type = BLUESKY_BLOCK_CACHED;
-}
-
-void bluesky_block_fetch(BlueSkyFS *fs, BlueSkyBlock *block,
+void bluesky_block_fetch(BlueSkyInode *inode, BlueSkyBlock *block,
BlueSkyStoreAsync *barrier)
{
if (block->type != BLUESKY_BLOCK_REF)
return;
- BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
- async->op = STORE_OP_GET;
- async->key = g_strdup(block->ref);
- bluesky_store_async_add_notifier(async, (GFunc)block_fetch_completion, block);
- bluesky_store_async_submit(async);
-
- if (barrier != NULL)
- bluesky_store_add_barrier(barrier, async);
- else
- bluesky_store_async_wait(async);
-
- bluesky_store_async_unref(async);
- g_atomic_int_add(&fs->cache_total, 1);
+ g_mutex_lock(block->cloudref->lock);
+ bluesky_cloudlog_fetch(block->cloudref);
+ block->data = block->cloudref->data;
+ bluesky_string_ref(block->data);
+ g_mutex_unlock(block->cloudref->lock);
+ block->type = BLUESKY_BLOCK_CACHED;
+ g_atomic_int_add(&inode->fs->cache_total, 1);
}
/* Write the given block to cloud-backed storage and mark it clean. */
-void bluesky_block_flush(BlueSkyFS *fs, BlueSkyBlock *block,
- BlueSkyStoreAsync *barrier)
+void bluesky_block_flush(BlueSkyInode *inode, BlueSkyBlock *block,
+ GList **log_items)
{
+ BlueSkyFS *fs = inode->fs;
+
if (block->type != BLUESKY_BLOCK_DIRTY)
return;
- BlueSkyRCStr *data = block->data;
+ if (block->cloudref != NULL)
+ bluesky_cloudlog_unref(block->cloudref);
- GChecksum *csum = g_checksum_new(G_CHECKSUM_SHA256);
- g_checksum_update(csum, (const guchar *)data->data, data->len);
- gchar *name = g_strdup(g_checksum_get_string(csum));
+ BlueSkyRCStr *data = block->data;
- /* Store the file data asynchronously, and don't bother waiting for a
- * response. */
- BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
- async->op = STORE_OP_PUT;
- async->key = g_strdup(name);
+ BlueSkyCloudLog *cloudlog = bluesky_cloudlog_new(fs);
+ cloudlog->type = LOGTYPE_DATA;
+ cloudlog->inum = inode->inum;
+ cloudlog->data = data;
bluesky_string_ref(data);
- async->data = data;
- bluesky_store_async_submit(async);
- if (barrier != NULL)
- bluesky_store_add_barrier(barrier, async);
- bluesky_store_async_unref(async);
+ bluesky_cloudlog_sync(cloudlog);
+ *log_items = g_list_prepend(*log_items, cloudlog);
+ bluesky_cloudlog_insert(cloudlog);
- g_free(block->ref);
- block->ref = name;
+ block->cloudref = cloudlog;
+ bluesky_cloudlog_ref(cloudlog);
block->type = BLUESKY_BLOCK_CACHED;
g_atomic_int_add(&fs->cache_dirty, -1);
-
- g_checksum_free(csum);
}
/* Flush all blocks in a file to stable storage. */
-void bluesky_file_flush(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
+void bluesky_file_flush(BlueSkyInode *inode, GList **log_items)
{
g_return_if_fail(inode->type == BLUESKY_REGULAR);
for (int i = 0; i < inode->blocks->len; i++) {
BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
- bluesky_block_flush(inode->fs, b, barrier);
+ bluesky_block_flush(inode, b, log_items);
}
}
b->data = NULL;
b->type = BLUESKY_BLOCK_REF;
g_atomic_int_add(&inode->fs->cache_total, -1);
+ g_mutex_lock(b->cloudref->lock);
+ if (b->cloudref->location_flags & CLOUDLOG_JOURNAL) {
+ bluesky_string_unref(b->cloudref->data);
+ b->cloudref->data = NULL;
+ }
+ g_mutex_unlock(b->cloudref->lock);
}
}
}