switch (block->type) {
case BLUESKY_BLOCK_ZERO:
- g_print("Allocating zero block of size %zd\n", block_len);
block->data = bluesky_string_new(g_malloc0(block_len), block_len);
break;
case BLUESKY_BLOCK_REF:
break;
}
+ if (block->type != BLUESKY_BLOCK_CACHED
+ && block->type != BLUESKY_BLOCK_DIRTY)
+ g_atomic_int_add(&inode->fs->cache_total, 1);
+ if (block->type != BLUESKY_BLOCK_DIRTY)
+ g_atomic_int_add(&inode->fs->cache_dirty, 1);
+
block->type = BLUESKY_BLOCK_DIRTY;
}
if (size == inode->size)
return;
- g_print("Truncating file to %"PRIi64" bytes\n", size);
+ if (bluesky_verbose) {
+ g_log("bluesky/file", G_LOG_LEVEL_DEBUG,
+ "Truncating file to %"PRIi64" bytes", size);
+ }
uint64_t blocks = (size + BLUESKY_BLOCK_SIZE - 1) / BLUESKY_BLOCK_SIZE;
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);
}
g_array_set_size(inode->blocks, blocks);
void bluesky_file_write(BlueSkyInode *inode, uint64_t offset,
const char *data, gint len)
{
- g_print("Write %d bytes at offset %"PRIi64"\n", len, offset);
-
g_return_if_fail(inode->type == BLUESKY_REGULAR);
g_return_if_fail(offset < inode->size);
g_return_if_fail(len <= inode->size - offset);
void bluesky_file_read(BlueSkyInode *inode, uint64_t offset,
char *buf, gint len)
{
- g_print("Read %d bytes at offset %"PRIi64"\n", len, offset);
-
if (len == 0 && offset <= inode->size)
return;
uint64_t start_block, end_block;
start_block = offset / BLUESKY_BLOCK_SIZE;
end_block = (offset + len - 1) / BLUESKY_BLOCK_SIZE;
- g_print("Start prefetch on blocks %"PRIi64" .. %"PRIi64"\n",
- start_block, end_block);
+ if (bluesky_verbose) {
+ g_log("bluesky/file", G_LOG_LEVEL_DEBUG,
+ "Start prefetch on blocks %"PRIi64" .. %"PRIi64,
+ start_block, end_block);
+ }
for (uint64_t i = start_block; i <= end_block; i++) {
BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock,
i);
bluesky_store_async_submit(barrier);
bluesky_store_async_wait(barrier);
bluesky_store_async_unref(barrier);
- g_print("Prefetch complete.\n");
+ if (bluesky_verbose) {
+ g_log("bluesky/file", G_LOG_LEVEL_DEBUG, "Prefetch complete.");
+ }
while (len > 0) {
uint64_t block_num = offset / BLUESKY_BLOCK_SIZE;
bluesky_string_unref(block->data);
block->data = async->data;
bluesky_string_ref(block->data);
+
+ if (block->data == NULL) {
+ g_warning("Failed to fetch data block from store!\n");
+ block->data = bluesky_string_new(g_malloc0(BLUESKY_BLOCK_SIZE),
+ BLUESKY_BLOCK_SIZE);
+ }
+
block->type = BLUESKY_BLOCK_CACHED;
}
bluesky_store_async_wait(async);
bluesky_store_async_unref(async);
+ g_atomic_int_add(&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)
+ GList **log_items)
{
if (block->type != BLUESKY_BLOCK_DIRTY)
return;
BlueSkyRCStr *data = block->data;
- 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));
-
- /* 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);
+ gchar *name = bluesky_cloudlog_id_to_string(cloudlog->id);
+ cloudlog->type = LOGTYPE_DATA;
+ cloudlog->inum = 0; //FIXME
+ 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->type = BLUESKY_BLOCK_CACHED;
-
- g_checksum_free(csum);
+ g_atomic_int_add(&fs->cache_dirty, -1);
}
/* 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->fs, b, log_items);
}
}
for (int i = 0; i < inode->blocks->len; i++) {
BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i);
if (b->type == BLUESKY_BLOCK_CACHED) {
- g_log("bluesky/cache", G_LOG_LEVEL_DEBUG,
- "Dropping block %d of inode %"PRIu64" from cache",
- i, inode->inum);
+ if (bluesky_verbose) {
+ g_log("bluesky/cache", G_LOG_LEVEL_DEBUG,
+ "Dropping block %d of inode %"PRIu64" from cache",
+ i, inode->inum);
+ g_log("bluesky/cache", G_LOG_LEVEL_DEBUG,
+ " (reference count was %d)", b->data->refcount);
+ }
bluesky_string_unref(b->data);
b->data = NULL;
b->type = BLUESKY_BLOCK_REF;
+ g_atomic_int_add(&inode->fs->cache_total, -1);
}
}
}
projects / bluesky.git / blobdiff