X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Ffile.c;h=35ed1dc72b5cfb3a92f0ffd4908c8efa13b46063;hb=966a43ffed492d387e0d75e56c3984d9001c15b1;hp=09e4805547a229d5b4884b54e2de21951e578405;hpb=ffadf57d27b07d5ba8c0de11649ff08e999f53f4;p=bluesky.git diff --git a/bluesky/file.c b/bluesky/file.c index 09e4805..35ed1dc 100644 --- a/bluesky/file.c +++ b/bluesky/file.c @@ -31,11 +31,10 @@ void bluesky_block_touch(BlueSkyInode *inode, uint64_t i) 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: - bluesky_block_fetch(inode->fs, block); + bluesky_block_fetch(inode->fs, block, NULL); g_assert(block->type == BLUESKY_BLOCK_CACHED); /* Fall through */ case BLUESKY_BLOCK_CACHED: @@ -44,6 +43,12 @@ void bluesky_block_touch(BlueSkyInode *inode, uint64_t i) 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; } @@ -56,7 +61,10 @@ void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size) 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; @@ -71,7 +79,8 @@ void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size) inode->blocks->len - 1); if (b->type != BLUESKY_BLOCK_ZERO - && b->data->len < BLUESKY_BLOCK_SIZE) { + && (b->type == BLUESKY_BLOCK_REF + || b->data->len < BLUESKY_BLOCK_SIZE)) { bluesky_block_touch(inode, inode->blocks->len - 1); gsize old_size = b->data->len; bluesky_string_resize(b->data, BLUESKY_BLOCK_SIZE); @@ -86,6 +95,11 @@ void bluesky_file_truncate(BlueSkyInode *inode, uint64_t 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); @@ -117,8 +131,6 @@ void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size) 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); @@ -147,8 +159,6 @@ void bluesky_file_write(BlueSkyInode *inode, uint64_t 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; @@ -156,6 +166,30 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset, g_return_if_fail(offset < inode->size); g_return_if_fail(len <= inode->size - offset); + /* Start fetches on any data blocks that we will need for this read. */ + BlueSkyStoreAsync *barrier = bluesky_store_async_new(inode->fs->store); + barrier->op = STORE_OP_BARRIER; + uint64_t start_block, end_block; + start_block = offset / BLUESKY_BLOCK_SIZE; + end_block = (offset + len - 1) / BLUESKY_BLOCK_SIZE; + 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); + if (b->type == BLUESKY_BLOCK_REF) + bluesky_block_fetch(inode->fs, b, barrier); + } + bluesky_store_async_submit(barrier); + bluesky_store_async_wait(barrier); + bluesky_store_async_unref(barrier); + if (bluesky_verbose) { + g_log("bluesky/file", G_LOG_LEVEL_DEBUG, "Prefetch complete."); + } + while (len > 0) { uint64_t block_num = offset / BLUESKY_BLOCK_SIZE; gint block_offset = offset % BLUESKY_BLOCK_SIZE; @@ -168,7 +202,7 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset, memset(buf, 0, bytes); break; case BLUESKY_BLOCK_REF: - bluesky_block_fetch(inode->fs, b); + bluesky_block_fetch(inode->fs, b, NULL); /* Fall through */ case BLUESKY_BLOCK_CACHED: case BLUESKY_BLOCK_DIRTY: @@ -184,16 +218,35 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset, /* Read the given block from cloud-backed storage if the data is not already * cached. */ -void bluesky_block_fetch(BlueSkyFS *fs, BlueSkyBlock *block) +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, + BlueSkyStoreAsync *barrier) { if (block->type != BLUESKY_BLOCK_REF) return; - BlueSkyRCStr *string = bluesky_store_get(fs->store, block->ref); + 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); - bluesky_string_unref(block->data); - block->data = string; - block->type = BLUESKY_BLOCK_CACHED; + 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); } /* Write the given block to cloud-backed storage and mark it clean. */ @@ -224,13 +277,10 @@ void bluesky_block_flush(BlueSkyFS *fs, BlueSkyBlock *block, g_free(block->ref); block->ref = name; - /* block->type = BLUESKY_BLOCK_CACHED; */ - bluesky_string_unref(block->data); - block->data = NULL; - block->type = BLUESKY_BLOCK_REF; + block->type = BLUESKY_BLOCK_CACHED; + g_atomic_int_add(&fs->cache_dirty, -1); g_checksum_free(csum); - //bluesky_string_unref(data); } /* Flush all blocks in a file to stable storage. */ @@ -243,3 +293,27 @@ void bluesky_file_flush(BlueSkyInode *inode, BlueSkyStoreAsync *barrier) bluesky_block_flush(inode->fs, b, barrier); } } + +/* Drop clean data blocks for a file from cache. */ +void bluesky_file_drop_cached(BlueSkyInode *inode) +{ + 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); + if (b->type == BLUESKY_BLOCK_CACHED) { + 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); + } + } +}