From cbdfa738c245019b7b711854d03f1ed87223ba49 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 28 May 2020 22:24:08 +0200 Subject: Turn the sqfs_block_writer_t into an interface This way, everything that could be done through the hooks (and more) can be done by simply providign a custom implementation. The result is a lot clener that the previous hook based version. Signed-off-by: David Oberhollenzer --- lib/common/statistics.c | 2 +- lib/sqfs/block_processor/common.c | 4 +- lib/sqfs/block_writer.c | 77 ++++++++++++++++++++------------------- 3 files changed, 43 insertions(+), 40 deletions(-) (limited to 'lib') diff --git a/lib/common/statistics.c b/lib/common/statistics.c index 079c1b1..82e545d 100644 --- a/lib/common/statistics.c +++ b/lib/common/statistics.c @@ -18,7 +18,7 @@ void sqfs_print_statistics(const sqfs_super_t *super, size_t ratio; proc_stats = sqfs_block_processor_get_stats(blk); - blocks_written = sqfs_block_writer_get_block_count(wr); + blocks_written = wr->get_block_count(wr); bytes_written = super->inode_table_start - sizeof(*super); diff --git a/lib/sqfs/block_processor/common.c b/lib/sqfs/block_processor/common.c index 757544a..e3d5486 100644 --- a/lib/sqfs/block_processor/common.c +++ b/lib/sqfs/block_processor/common.c @@ -68,8 +68,8 @@ int process_completed_block(sqfs_block_processor_t *proc, sqfs_block_t *blk) sqfs_u32 size; int err; - err = sqfs_block_writer_write(proc->wr, blk->size, blk->checksum, - blk->flags, blk->data, &location); + err = proc->wr->write_data_block(proc->wr, blk->size, blk->checksum, + blk->flags, blk->data, &location); if (err) goto out; diff --git a/lib/sqfs/block_writer.c b/lib/sqfs/block_writer.c index 06cbd37..a6ca4b3 100644 --- a/lib/sqfs/block_writer.c +++ b/lib/sqfs/block_writer.c @@ -25,8 +25,8 @@ typedef struct { sqfs_u64 hash; } blk_info_t; -struct sqfs_block_writer_t { - sqfs_object_t base; +typedef struct { + sqfs_block_writer_t base; sqfs_file_t *file; size_t num_blocks; @@ -39,9 +39,9 @@ struct sqfs_block_writer_t { sqfs_u64 start; size_t file_start; -}; +} block_writer_default_t; -static int store_block_location(sqfs_block_writer_t *wr, sqfs_u64 offset, +static int store_block_location(block_writer_default_t *wr, sqfs_u64 offset, sqfs_u32 size, sqfs_u32 chksum) { size_t new_sz; @@ -64,7 +64,7 @@ static int store_block_location(sqfs_block_writer_t *wr, sqfs_u64 offset, return 0; } -static size_t deduplicate_blocks(sqfs_block_writer_t *wr, size_t count) +static size_t deduplicate_blocks(block_writer_default_t *wr, size_t count) { size_t i, j; @@ -85,7 +85,7 @@ static size_t deduplicate_blocks(sqfs_block_writer_t *wr, size_t count) return i; } -static int align_file(sqfs_block_writer_t *wr) +static int align_file(block_writer_default_t *wr) { void *padding; sqfs_u64 size; @@ -111,41 +111,15 @@ static int align_file(sqfs_block_writer_t *wr) static void block_writer_destroy(sqfs_object_t *wr) { - free(((sqfs_block_writer_t *)wr)->blocks); + free(((block_writer_default_t *)wr)->blocks); free(wr); } -sqfs_block_writer_t *sqfs_block_writer_create(sqfs_file_t *file, - size_t devblksz, sqfs_u32 flags) -{ - sqfs_block_writer_t *wr; - - if (flags != 0) - return NULL; - - wr = calloc(1, sizeof(*wr)); - if (wr == NULL) - return NULL; - - ((sqfs_object_t *)wr)->destroy = block_writer_destroy; - wr->file = file; - wr->devblksz = devblksz; - wr->max_blocks = INIT_BLOCK_COUNT; - wr->data_area_start = wr->file->get_size(wr->file); - - wr->blocks = alloc_array(sizeof(wr->blocks[0]), wr->max_blocks); - if (wr->blocks == NULL) { - free(wr); - return NULL; - } - - return wr; -} - -int sqfs_block_writer_write(sqfs_block_writer_t *wr, sqfs_u32 size, +static int write_data_block(sqfs_block_writer_t *base, sqfs_u32 size, sqfs_u32 checksum, sqfs_u32 flags, const sqfs_u8 *data, sqfs_u64 *location) { + block_writer_default_t *wr = (block_writer_default_t *)base; size_t start, count; sqfs_u64 offset; sqfs_u32 out; @@ -219,7 +193,36 @@ int sqfs_block_writer_write(sqfs_block_writer_t *wr, sqfs_u32 size, return 0; } -sqfs_u64 sqfs_block_writer_get_block_count(const sqfs_block_writer_t *wr) +static sqfs_u64 get_block_count(const sqfs_block_writer_t *wr) { - return wr->blocks_written; + return ((const block_writer_default_t *)wr)->blocks_written; +} + +sqfs_block_writer_t *sqfs_block_writer_create(sqfs_file_t *file, + size_t devblksz, sqfs_u32 flags) +{ + block_writer_default_t *wr; + + if (flags != 0) + return NULL; + + wr = calloc(1, sizeof(*wr)); + if (wr == NULL) + return NULL; + + ((sqfs_block_writer_t *)wr)->write_data_block = write_data_block; + ((sqfs_block_writer_t *)wr)->get_block_count = get_block_count; + ((sqfs_object_t *)wr)->destroy = block_writer_destroy; + wr->file = file; + wr->devblksz = devblksz; + wr->max_blocks = INIT_BLOCK_COUNT; + wr->data_area_start = wr->file->get_size(wr->file); + + wr->blocks = alloc_array(sizeof(wr->blocks[0]), wr->max_blocks); + if (wr->blocks == NULL) { + free(wr); + return NULL; + } + + return (sqfs_block_writer_t *)wr; } -- cgit v1.2.3