X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Ffile.c;h=5c4b157febaf6956dd2c55d524184e9691a55c0c;hb=4de397517bdb0ce26e0bdd039fd99bcba50f385e;hp=9b9f91649b991b04d66fca2413201536d0a22dff;hpb=353c0424e56002c6a662df81108f2e9c84190cf1;p=bluesky.git diff --git a/bluesky/file.c b/bluesky/file.c index 9b9f916..5c4b157 100644 --- a/bluesky/file.c +++ b/bluesky/file.c @@ -31,24 +31,30 @@ 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); + block->dirty = bluesky_string_new(g_malloc0(block_len), block_len); break; case BLUESKY_BLOCK_REF: - bluesky_block_fetch(inode->fs, block); - g_assert(block->type == BLUESKY_BLOCK_CACHED); - /* Fall through */ - case BLUESKY_BLOCK_CACHED: + // FIXME: locking on the cloudlog? + bluesky_block_fetch(inode, block, NULL); + bluesky_string_ref(block->ref->data); + block->dirty = bluesky_string_dup(block->ref->data); + break; case BLUESKY_BLOCK_DIRTY: - block->data = bluesky_string_dup(block->data); + block->dirty = bluesky_string_dup(block->dirty); break; } + if (block->type != BLUESKY_BLOCK_DIRTY) + g_atomic_int_add(&inode->fs->cache_dirty, 1); + block->type = BLUESKY_BLOCK_DIRTY; + bluesky_cloudlog_unref(block->ref); + block->ref = NULL; } /* Set the size of a file. This will truncate or extend the file as needed. * Newly-allocated bytes are zeroed. */ +// FIXME void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size) { g_return_if_fail(size <= BLUESKY_MAX_FILE_SIZE); @@ -56,7 +62,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; @@ -72,11 +81,11 @@ void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size) if (b->type != BLUESKY_BLOCK_ZERO && (b->type == BLUESKY_BLOCK_REF - || b->data->len < BLUESKY_BLOCK_SIZE)) { + || b->dirty->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); - memset(&b->data->data[old_size], 0, + gsize old_size = b->dirty->len; + bluesky_string_resize(b->dirty, BLUESKY_BLOCK_SIZE); + memset(&b->dirty->data[old_size], 0, BLUESKY_BLOCK_SIZE - old_size); } } @@ -84,10 +93,12 @@ void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size) g_array_set_size(inode->blocks, blocks); } else if (blocks < inode->blocks->len) { /* Delete blocks from a file. Must reclaim memory. */ - for (guint i = inode->blocks->len; i < blocks; i++) { + for (guint i = blocks; i < inode->blocks->len; i++) { BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, i); - g_free(b->ref); - bluesky_string_unref(b->data); + if (b->type == BLUESKY_BLOCK_DIRTY) + g_atomic_int_add(&inode->fs->cache_dirty, -1); + bluesky_string_unref(b->dirty); + bluesky_cloudlog_unref(b->ref); } g_array_set_size(inode->blocks, blocks); } @@ -100,13 +111,13 @@ void bluesky_file_truncate(BlueSkyInode *inode, uint64_t size) if (b->type != BLUESKY_BLOCK_ZERO) { bluesky_block_touch(inode, blocks - 1); - gsize old_size = b->data->len; + gsize old_size = b->dirty->len; gsize new_size = size - (blocks - 1) * BLUESKY_BLOCK_SIZE; - bluesky_string_resize(b->data, new_size); + bluesky_string_resize(b->dirty, new_size); if (new_size > old_size) { - memset(&b->data->data[old_size], 0, new_size - old_size); + memset(&b->dirty->data[old_size], 0, new_size - old_size); } } } @@ -118,8 +129,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); @@ -127,6 +136,8 @@ void bluesky_file_write(BlueSkyInode *inode, uint64_t offset, if (len == 0) return; + // TODO: Optimization: If we are entirely overwriting a block we don't need + // to fetch it frm storage first. while (len > 0) { uint64_t block_num = offset / BLUESKY_BLOCK_SIZE; gint block_offset = offset % BLUESKY_BLOCK_SIZE; @@ -135,7 +146,7 @@ void bluesky_file_write(BlueSkyInode *inode, uint64_t offset, bluesky_block_touch(inode, block_num); BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, block_num); - memcpy(&b->data->data[block_offset], data, bytes); + memcpy(&b->dirty->data[block_offset], data, bytes); offset += bytes; data += bytes; @@ -148,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; @@ -157,6 +166,23 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset, g_return_if_fail(offset < inode->size); g_return_if_fail(len <= inode->size - offset); + BlueSkyProfile *profile = bluesky_profile_get(); + + bluesky_profile_add_event(profile, + g_strdup_printf("Start file read prefetch")); + uint64_t start_block, end_block; + start_block = offset / BLUESKY_BLOCK_SIZE; + end_block = (offset + len - 1) / BLUESKY_BLOCK_SIZE; + 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_cloudlog_prefetch(b->ref); + } + + bluesky_profile_add_event(profile, + g_strdup_printf("End file read prefetch")); + while (len > 0) { uint64_t block_num = offset / BLUESKY_BLOCK_SIZE; gint block_offset = offset % BLUESKY_BLOCK_SIZE; @@ -164,83 +190,98 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset, BlueSkyBlock *b = &g_array_index(inode->blocks, BlueSkyBlock, block_num); - switch (b->type) { - case BLUESKY_BLOCK_ZERO: + if (b->type == BLUESKY_BLOCK_ZERO) { memset(buf, 0, bytes); - break; - case BLUESKY_BLOCK_REF: - bluesky_block_fetch(inode->fs, b); - /* Fall through */ - case BLUESKY_BLOCK_CACHED: - case BLUESKY_BLOCK_DIRTY: - memcpy(buf, &b->data->data[block_offset], bytes); - break; + } else { + BlueSkyRCStr *data = NULL; + if (b->type == BLUESKY_BLOCK_REF) { + bluesky_block_fetch(inode, b, NULL); + data = b->ref->data; + } else if (b->type == BLUESKY_BLOCK_DIRTY) { + data = b->dirty; + } + memcpy(buf, &data->data[block_offset], bytes); } offset += bytes; buf += bytes; len -= bytes; } + + bluesky_profile_add_event(profile, + g_strdup_printf("BlueSky read complete")); } -/* Read the given block from cloud-backed storage if the data is not already - * 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; - BlueSkyRCStr *string = bluesky_store_get(fs->store, block->ref); - - bluesky_string_unref(block->data); - block->data = string; - block->type = BLUESKY_BLOCK_CACHED; + g_mutex_lock(block->ref->lock); + bluesky_cloudlog_fetch(block->ref); + g_mutex_unlock(block->ref->lock); + block->type = BLUESKY_BLOCK_REF; } /* 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; - - 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); - 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); - - 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; + g_assert(block->ref == NULL); + + BlueSkyCloudLog *cloudlog = bluesky_cloudlog_new(fs, NULL); + cloudlog->type = LOGTYPE_DATA; + cloudlog->inum = inode->inum; + cloudlog->data = block->dirty; // String ownership is transferred + bluesky_cloudlog_stats_update(cloudlog, 1); + bluesky_cloudlog_sync(cloudlog); + bluesky_cloudlog_ref(cloudlog); // Reference for log_items list + *log_items = g_list_prepend(*log_items, cloudlog); + bluesky_cloudlog_insert(cloudlog); - g_checksum_free(csum); - //bluesky_string_unref(data); + block->ref = cloudlog; // Uses initial reference from _new() + + block->type = BLUESKY_BLOCK_REF; + block->dirty = NULL; + 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, b, log_items); + } +} + +/* 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); - bluesky_block_flush(inode->fs, b, barrier); + if (b->type == BLUESKY_BLOCK_REF) { + g_mutex_lock(b->ref->lock); + if (b->ref->data != NULL + && g_atomic_int_get(&b->ref->data_lock_count) == 0 + && (b->ref->location_flags != 0)) + { + bluesky_cloudlog_stats_update(b->ref, -1); + bluesky_string_unref(b->ref->data); + b->ref->data = NULL; + bluesky_cloudlog_stats_update(b->ref, 1); + } + g_mutex_unlock(b->ref->lock); + } } }