summaryrefslogtreecommitdiff
path: root/lib/sqfs/block_processor
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqfs/block_processor')
-rw-r--r--lib/sqfs/block_processor/block.c155
-rw-r--r--lib/sqfs/block_processor/common.c16
-rw-r--r--lib/sqfs/block_processor/internal.h24
3 files changed, 21 insertions, 174 deletions
diff --git a/lib/sqfs/block_processor/block.c b/lib/sqfs/block_processor/block.c
index 49892be..e88456a 100644
--- a/lib/sqfs/block_processor/block.c
+++ b/lib/sqfs/block_processor/block.c
@@ -9,164 +9,33 @@
#include <string.h>
-static int store_block_location(sqfs_block_processor_t *proc, sqfs_u64 offset,
- sqfs_u32 size, sqfs_u32 chksum)
-{
- size_t new_sz;
- void *new;
-
- if (proc->num_blocks == proc->max_blocks) {
- new_sz = proc->max_blocks * 2;
- new = realloc(proc->blocks, sizeof(proc->blocks[0]) * new_sz);
-
- if (new == NULL)
- return SQFS_ERROR_ALLOC;
-
- proc->blocks = new;
- proc->max_blocks = new_sz;
- }
-
- proc->blocks[proc->num_blocks].offset = offset;
- proc->blocks[proc->num_blocks].hash = MK_BLK_HASH(chksum, size);
- proc->num_blocks += 1;
- return 0;
-}
-
-static size_t deduplicate_blocks(sqfs_block_processor_t *proc, size_t count)
-{
- size_t i, j;
-
- for (i = 0; i < proc->file_start; ++i) {
- for (j = 0; j < count; ++j) {
- if (proc->blocks[i + j].hash !=
- proc->blocks[proc->file_start + j].hash)
- break;
- }
-
- if (j == count)
- break;
- }
-
- return i;
-}
-
-static int align_file(sqfs_block_processor_t *proc, sqfs_block_t *blk)
-{
- sqfs_u32 chksum;
- void *padding;
- sqfs_u64 size;
- size_t diff;
- int ret;
-
- if (!(blk->flags & SQFS_BLK_ALIGN))
- return 0;
-
- size = proc->file->get_size(proc->file);
- diff = size % proc->devblksz;
- if (diff == 0)
- return 0;
-
- padding = calloc(1, diff);
- if (padding == 0)
- return SQFS_ERROR_ALLOC;
-
- if (proc->hooks != NULL && proc->hooks->prepare_padding != NULL)
- proc->hooks->prepare_padding(proc->user_ptr, padding, diff);
-
- chksum = crc32(0, padding, diff);
-
- ret = proc->file->write_at(proc->file, size, padding, diff);
- free(padding);
- if (ret)
- return ret;
-
- return store_block_location(proc, size, diff | (1 << 24), chksum);
-}
-
int process_completed_block(sqfs_block_processor_t *proc, sqfs_block_t *blk)
{
- sqfs_u64 offset, bytes;
- size_t start, count;
- sqfs_u32 out;
+ sqfs_u64 location;
+ sqfs_u32 size;
int err;
- if (proc->hooks != NULL && proc->hooks->pre_block_write != NULL) {
- proc->hooks->pre_block_write(proc->user_ptr, blk, proc->file);
- }
-
- if (blk->flags & SQFS_BLK_FIRST_BLOCK) {
- proc->start = proc->file->get_size(proc->file);
- proc->file_start = proc->num_blocks;
+ size = blk->size;
+ if (!(blk->flags & SQFS_BLK_IS_COMPRESSED))
+ size |= 1 << 24;
- err = align_file(proc, blk);
- if (err)
- return err;
- }
+ err = sqfs_block_writer_write(proc->wr, blk, &location);
+ if (err)
+ return err;
if (blk->size != 0) {
- out = blk->size;
- if (!(blk->flags & SQFS_BLK_IS_COMPRESSED))
- out |= 1 << 24;
-
- offset = proc->file->get_size(proc->file);
-
if (blk->flags & SQFS_BLK_FRAGMENT_BLOCK) {
err = sqfs_frag_table_set(proc->frag_tbl, blk->index,
- offset, out);
+ location, size);
if (err)
return err;
} else {
- blk->inode->extra[blk->index] = out;
+ blk->inode->extra[blk->index] = size;
}
-
- err = store_block_location(proc, offset, out, blk->checksum);
- if (err)
- return err;
-
- err = proc->file->write_at(proc->file, offset,
- blk->data, blk->size);
- if (err)
- return err;
- }
-
- if (proc->hooks != NULL && proc->hooks->post_block_write != NULL) {
- proc->hooks->post_block_write(proc->user_ptr, blk, proc->file);
}
- if (blk->flags & SQFS_BLK_LAST_BLOCK) {
- err = align_file(proc, blk);
- if (err)
- return err;
-
- count = proc->num_blocks - proc->file_start;
- start = deduplicate_blocks(proc, count);
- offset = proc->blocks[start].offset;
-
- sqfs_inode_set_file_block_start(blk->inode, offset);
-
- if (start >= proc->file_start)
- return 0;
-
- offset = start + count;
- if (offset >= proc->file_start) {
- count = proc->num_blocks - offset;
- proc->num_blocks = offset;
- } else {
- proc->num_blocks = proc->file_start;
- }
-
- if (proc->hooks != NULL &&
- proc->hooks->notify_blocks_erased != NULL) {
- bytes = proc->file->get_size(proc->file) - proc->start;
-
- proc->hooks->notify_blocks_erased(proc->user_ptr,
- count, bytes);
- }
-
- err = proc->file->truncate(proc->file, proc->start);
- if (err)
- return err;
- }
+ if (blk->flags & SQFS_BLK_LAST_BLOCK)
+ sqfs_inode_set_file_block_start(blk->inode, location);
return 0;
}
diff --git a/lib/sqfs/block_processor/common.c b/lib/sqfs/block_processor/common.c
index c6375dd..806a595 100644
--- a/lib/sqfs/block_processor/common.c
+++ b/lib/sqfs/block_processor/common.c
@@ -25,19 +25,16 @@ int block_processor_init(sqfs_block_processor_t *proc, size_t max_block_size,
proc->max_block_size = max_block_size;
proc->num_workers = num_workers;
proc->max_backlog = max_backlog;
- proc->devblksz = devblksz;
proc->cmp = cmp;
proc->file = file;
- proc->max_blocks = INIT_BLOCK_COUNT;
proc->frag_tbl = sqfs_frag_table_create(0);
if (proc->frag_tbl == NULL)
return -1;
- proc->blocks = alloc_array(sizeof(proc->blocks[0]), proc->max_blocks);
- if (proc->blocks == NULL)
+ proc->wr = sqfs_block_writer_create(file, devblksz, 0);
+ if (proc->wr == NULL)
return -1;
-
return 0;
}
@@ -45,11 +42,12 @@ void block_processor_cleanup(sqfs_block_processor_t *proc)
{
if (proc->frag_tbl != NULL)
sqfs_frag_table_destroy(proc->frag_tbl);
+ if (proc->wr != NULL)
+ sqfs_block_writer_destroy(proc->wr);
free_blk_list(proc->queue);
free_blk_list(proc->done);
free(proc->blk_current);
free(proc->frag_block);
- free(proc->blocks);
free(proc);
}
@@ -63,10 +61,8 @@ int sqfs_block_processor_write_fragment_table(sqfs_block_processor_t *proc,
int sqfs_block_processor_set_hooks(sqfs_block_processor_t *proc, void *user_ptr,
const sqfs_block_hooks_t *hooks)
{
- if (hooks->size != sizeof(*hooks))
- return SQFS_ERROR_UNSUPPORTED;
-
proc->hooks = hooks;
proc->user_ptr = user_ptr;
- return 0;
+
+ return sqfs_block_writer_set_hooks(proc->wr, user_ptr, hooks);
}
diff --git a/lib/sqfs/block_processor/internal.h b/lib/sqfs/block_processor/internal.h
index 40871b9..16f0edb 100644
--- a/lib/sqfs/block_processor/internal.h
+++ b/lib/sqfs/block_processor/internal.h
@@ -10,6 +10,7 @@
#include "config.h"
#include "sqfs/block_processor.h"
+#include "sqfs/block_writer.h"
#include "sqfs/frag_table.h"
#include "sqfs/compressor.h"
#include "sqfs/inode.h"
@@ -31,19 +32,6 @@
#include <windows.h>
#endif
-
-#define MK_BLK_HASH(chksum, size) \
- (((sqfs_u64)(size) << 32) | (sqfs_u64)(chksum))
-
-#define INIT_BLOCK_COUNT (128)
-
-
-typedef struct {
- sqfs_u64 offset;
- sqfs_u64 hash;
-} blk_info_t;
-
-
typedef struct compress_worker_t compress_worker_t;
struct sqfs_block_processor_t {
@@ -73,24 +61,18 @@ struct sqfs_block_processor_t {
unsigned int num_workers;
size_t max_backlog;
- size_t devblksz;
sqfs_file_t *file;
sqfs_frag_table_t *frag_tbl;
- sqfs_u64 start;
-
- size_t file_start;
- size_t num_blocks;
- size_t max_blocks;
- blk_info_t *blocks;
sqfs_compressor_t *cmp;
sqfs_block_t *frag_block;
+ bool notify_threads;
+ sqfs_block_writer_t *wr;
const sqfs_block_hooks_t *hooks;
void *user_ptr;
- bool notify_threads;
/* file API */
sqfs_inode_generic_t *inode;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 22:45:39 +0000