Refactor out common code of the block processors

Code that already is shared between the pthread and the serial
processor as well as code that can be re-used by other threading
API implementations.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

1 files changed, 158 insertions, 0 deletions

diff --git a/lib/sqfs/blk_proc/common.c b/lib/sqfs/blk_proc/common.c
new file mode 100644
index 0000000..a3c91eb
--- /dev/null
+++ b/lib/sqfs/blk_proc/common.c
@@ -0,0 +1,158 @@
+/* SPDX-License-Identifier: LGPL-3.0-or-later */
+/*
+ * common.c
+ *
+ * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at>
+ */
+#define SQFS_BUILDING_DLL
+#include "internal.h"
+
+void free_blk_list(sqfs_block_t *list)
+{
+	sqfs_block_t *it;
+
+	while (list != NULL) {
+		it = list;
+		list = list->next;
+		free(it);
+	}
+}
+
+int block_processor_init(sqfs_block_processor_t *proc, size_t max_block_size,
+			 sqfs_compressor_t *cmp, unsigned int num_workers,
+			 size_t max_backlog, size_t devblksz,
+			 sqfs_file_t *file)
+{
+	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_list_max = INIT_BLOCK_COUNT;
+
+	proc->blocks = alloc_array(sizeof(proc->blocks[0]), proc->max_blocks);
+	if (proc->blocks == NULL)
+		return -1;
+
+	proc->frag_list = alloc_array(sizeof(proc->frag_list[0]),
+				      proc->frag_list_max);
+	if (proc->frag_list == NULL)
+		return -1;
+
+	return 0;
+}
+
+void block_processor_cleanup(sqfs_block_processor_t *proc)
+{
+	free_blk_list(proc->queue);
+	free_blk_list(proc->done);
+	free(proc->frag_block);
+	free(proc->frag_list);
+	free(proc->fragments);
+	free(proc->blocks);
+	free(proc);
+}
+
+void block_processor_store_done(sqfs_block_processor_t *proc,
+				sqfs_block_t *blk, int status)
+{
+	sqfs_block_t *it = proc->done, *prev = NULL;
+
+	while (it != NULL) {
+		if (it->sequence_number >= blk->sequence_number)
+			break;
+		prev = it;
+		it = it->next;
+	}
+
+	if (prev == NULL) {
+		blk->next = proc->done;
+		proc->done = blk;
+	} else {
+		blk->next = prev->next;
+		prev->next = blk;
+	}
+
+	if (status != 0 && proc->status == 0)
+		proc->status = status;
+
+	proc->backlog -= 1;
+}
+
+sqfs_block_t *block_processor_next_work_item(sqfs_block_processor_t *proc)
+{
+	sqfs_block_t *blk;
+
+	if (proc->status != 0)
+		return NULL;
+
+	blk = proc->queue;
+	proc->queue = blk->next;
+	blk->next = NULL;
+
+	if (proc->queue == NULL)
+		proc->queue_last = NULL;
+
+	return blk;
+}
+
+int block_processor_do_block(sqfs_block_t *block, sqfs_compressor_t *cmp,
+			     uint8_t *scratch, size_t scratch_size)
+{
+	ssize_t ret;
+
+	if (block->size == 0) {
+		block->checksum = 0;
+		return 0;
+	}
+
+	block->checksum = crc32(0, block->data, block->size);
+
+	if (block->flags & SQFS_BLK_IS_FRAGMENT)
+		return 0;
+
+	if (!(block->flags & SQFS_BLK_DONT_COMPRESS)) {
+		ret = cmp->do_block(cmp, block->data, block->size,
+				    scratch, scratch_size);
+		if (ret < 0)
+			return ret;
+
+		if (ret > 0) {
+			memcpy(block->data, scratch, ret);
+			block->size = ret;
+			block->flags |= SQFS_BLK_IS_COMPRESSED;
+		}
+	}
+
+	return 0;
+}
+
+int sqfs_block_processor_write_fragment_table(sqfs_block_processor_t *proc,
+					      sqfs_super_t *super)
+{
+	uint64_t start;
+	size_t size;
+	int ret;
+
+	if (proc->num_fragments == 0) {
+		super->fragment_entry_count = 0;
+		super->fragment_table_start = 0xFFFFFFFFFFFFFFFFUL;
+		super->flags &= ~SQFS_FLAG_ALWAYS_FRAGMENTS;
+		super->flags |= SQFS_FLAG_NO_FRAGMENTS;
+		return 0;
+	}
+
+	size = sizeof(proc->fragments[0]) * proc->num_fragments;
+	ret = sqfs_write_table(proc->file, proc->cmp,
+			       proc->fragments, size, &start);
+	if (ret)
+		return ret;
+
+	super->flags &= ~SQFS_FLAG_NO_FRAGMENTS;
+	super->flags |= SQFS_FLAG_ALWAYS_FRAGMENTS;
+	super->fragment_entry_count = proc->num_fragments;
+	super->fragment_table_start = start;
+	return 0;
+}