X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Ffile.c;h=8faae004275c6d3e35115968142b9ec0e0b1afe2;hb=60b4792d65ba4b2a45733894f6a57e6581ddc487;hp=8be3ea1cb78b393ac89e2abfffdefc4f5b04e726;hpb=f597cd5067ed36508118d2ecd29338e7b81f47e4;p=bluesky.git diff --git a/bluesky/file.c b/bluesky/file.c index 8be3ea1..8faae00 100644 --- a/bluesky/file.c +++ b/bluesky/file.c @@ -31,7 +31,6 @@ 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: @@ -62,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; @@ -129,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); @@ -159,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; @@ -174,8 +172,11 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset, 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); @@ -185,7 +186,9 @@ void bluesky_file_read(BlueSkyInode *inode, uint64_t offset, 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; @@ -222,6 +225,13 @@ static void block_fetch_completion(BlueSkyStoreAsync *async, gpointer data) 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; } @@ -248,16 +258,22 @@ void bluesky_block_fetch(BlueSkyFS *fs, BlueSkyBlock *block, /* Write the given block to cloud-backed storage and mark it clean. */ void bluesky_block_flush(BlueSkyFS *fs, BlueSkyBlock *block, - BlueSkyStoreAsync *barrier) + 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)); + 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); + *log_items = g_list_prepend(*log_items, bluesky_cloudlog_sync(cloudlog)); + bluesky_cloudlog_insert(cloudlog); /* Store the file data asynchronously, and don't bother waiting for a * response. */ @@ -276,18 +292,17 @@ void bluesky_block_flush(BlueSkyFS *fs, BlueSkyBlock *block, 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, BlueSkyStoreAsync *barrier, + 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, barrier, log_items); } } @@ -299,12 +314,14 @@ void bluesky_file_drop_cached(BlueSkyInode *inode) 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); + } - 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;