Remove remnants of the old data writer

 - Move the statstics hooks to the rest of the statistics code
 - Used the new data writer directly in gensquashfs & tar2sqfs
 - Demote what is left to a helper function for processing an
   input file and submitting it to the new data writer

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

3 files changed, 68 insertions, 133 deletions

diff --git a/lib/sqfshelper/Makemodule.am b/lib/sqfshelper/Makemodule.am
index 8a8deaa..896605a 100644
--- a/lib/sqfshelper/Makemodule.am
+++ b/lib/sqfshelper/Makemodule.am
@@ -6,7 +6,7 @@ libsqfshelper_a_SOURCES += lib/sqfshelper/print_version.c
 libsqfshelper_a_SOURCES += lib/sqfshelper/inode_stat.c
 libsqfshelper_a_SOURCES += lib/sqfshelper/data_reader_dump.c
 libsqfshelper_a_SOURCES += lib/sqfshelper/compress.c lib/sqfshelper/comp_opt.c
-libsqfshelper_a_SOURCES += include/data_writer.h lib/sqfshelper/data_writer.c
+libsqfshelper_a_SOURCES += lib/sqfshelper/data_writer.c
 libsqfshelper_a_SOURCES += lib/sqfshelper/write_xattr.c include/highlevel.h
 libsqfshelper_a_SOURCES += lib/sqfshelper/get_path.c lib/sqfshelper/io_stdin.c
 
diff --git a/lib/sqfshelper/data_writer.c b/lib/sqfshelper/data_writer.c
index a365e6d..5c01cb8 100644
--- a/lib/sqfshelper/data_writer.c
+++ b/lib/sqfshelper/data_writer.c
@@ -6,10 +6,6 @@
  */
 #include "config.h"
 
-#include "sqfs/data_writer.h"
-#include "sqfs/block.h"
-
-#include "data_writer.h"
 #include "highlevel.h"
 #include "util.h"
 
@@ -17,72 +13,14 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
-#include <errno.h>
-#include <zlib.h>
-
-struct data_writer_t {
-	sqfs_data_writer_t *proc;
-	sqfs_compressor_t *cmp;
-	sqfs_super_t *super;
-
-	data_writer_stats_t stats;
-};
-
-
-static void post_block_write(void *user, const sqfs_block_t *block,
-			     sqfs_file_t *file)
-{
-	data_writer_t *data = user;
-	(void)file;
-
-	if (block->flags & SQFS_BLK_FRAGMENT_BLOCK) {
-		data->stats.frag_blocks_written += 1;
-	} else {
-		data->stats.blocks_written += 1;
-	}
-
-	data->stats.bytes_written += block->size;
-}
-
-static void pre_fragment_store(void *user, sqfs_block_t *block)
-{
-	data_writer_t *data = user;
-	(void)block;
-
-	data->stats.frag_count += 1;
-}
-
-static void notify_blocks_erased(void *user, size_t count, uint64_t bytes)
-{
-	data_writer_t *data = user;
-	(void)bytes;
-
-	data->stats.bytes_written -= bytes;
-	data->stats.blocks_written -= count;
-	data->stats.duplicate_blocks += count;
-}
-
-static void notify_fragment_discard(void *user, const sqfs_block_t *block)
-{
-	data_writer_t *data = user;
-	(void)block;
-
-	data->stats.frag_dup += 1;
-}
-
-static const sqfs_block_hooks_t hooks = {
-	.post_block_write = post_block_write,
-	.pre_fragment_store = pre_fragment_store,
-	.notify_blocks_erased = notify_blocks_erased,
-	.notify_fragment_discard = notify_fragment_discard,
-};
 
 static bool is_zero_block(unsigned char *ptr, size_t size)
 {
 	return ptr[0] == 0 && memcmp(ptr, ptr + 1, size - 1) == 0;
 }
 
-static int add_sentinel_block(data_writer_t *data, sqfs_inode_generic_t *inode,
+static int add_sentinel_block(sqfs_data_writer_t *data,
+			      sqfs_inode_generic_t *inode,
 			      uint32_t flags)
 {
 	sqfs_block_t *blk = calloc(1, sizeof(*blk));
@@ -95,11 +33,11 @@ static int add_sentinel_block(data_writer_t *data, sqfs_inode_generic_t *inode,
 	blk->inode = inode;
 	blk->flags = flags;
 
-	return sqfs_data_writer_enqueue(data->proc, blk);
+	return sqfs_data_writer_enqueue(data, blk);
 }
 
-int write_data_from_file(data_writer_t *data, sqfs_inode_generic_t *inode,
-			 sqfs_file_t *file, int flags)
+int write_data_from_file(sqfs_data_writer_t *data, sqfs_inode_generic_t *inode,
+			 sqfs_file_t *file, size_t block_size, int flags)
 {
 	uint32_t blk_flags = SQFS_BLK_FIRST_BLOCK;
 	uint64_t filesz, offset;
@@ -116,8 +54,8 @@ int write_data_from_file(data_writer_t *data, sqfs_inode_generic_t *inode,
 	sqfs_inode_get_file_size(inode, &filesz);
 
 	for (offset = 0; offset < filesz; offset += diff) {
-		if (filesz - offset > (uint64_t)data->super->block_size) {
-			diff = data->super->block_size;
+		if (filesz - offset > (uint64_t)block_size) {
+			diff = block_size;
 		} else {
 			diff = filesz - offset;
 		}
@@ -131,8 +69,6 @@ int write_data_from_file(data_writer_t *data, sqfs_inode_generic_t *inode,
 		blk->index = i++;
 
 		if (is_zero_block(blk->data, blk->size)) {
-			data->stats.sparse_blocks += 1;
-
 			sqfs_inode_make_extended(inode);
 			inode->data.file_ext.sparse += blk->size;
 			inode->num_file_blocks += 1;
@@ -142,8 +78,7 @@ int write_data_from_file(data_writer_t *data, sqfs_inode_generic_t *inode,
 			continue;
 		}
 
-		if (diff < data->super->block_size &&
-		    !(flags & DW_DONT_FRAGMENT)) {
+		if (diff < block_size && !(flags & DW_DONT_FRAGMENT)) {
 			if (!(blk_flags & (SQFS_BLK_FIRST_BLOCK |
 					   SQFS_BLK_LAST_BLOCK))) {
 				blk_flags |= SQFS_BLK_LAST_BLOCK;
@@ -157,10 +92,10 @@ int write_data_from_file(data_writer_t *data, sqfs_inode_generic_t *inode,
 
 			blk->flags |= SQFS_BLK_IS_FRAGMENT;
 
-			if (sqfs_data_writer_enqueue(data->proc, blk))
+			if (sqfs_data_writer_enqueue(data, blk))
 				return -1;
 		} else {
-			if (sqfs_data_writer_enqueue(data->proc, blk))
+			if (sqfs_data_writer_enqueue(data, blk))
 				return -1;
 
 			blk_flags &= ~SQFS_BLK_FIRST_BLOCK;
@@ -174,62 +109,5 @@ int write_data_from_file(data_writer_t *data, sqfs_inode_generic_t *inode,
 		if (add_sentinel_block(data, inode, blk_flags))
 			return -1;
 	}
-
-	sqfs_inode_make_basic(inode);
-
-	data->stats.bytes_read += filesz;
-	data->stats.file_count += 1;
-	return 0;
-}
-
-data_writer_t *data_writer_create(sqfs_super_t *super, sqfs_compressor_t *cmp,
-				  sqfs_file_t *file, size_t devblksize,
-				  unsigned int num_jobs, size_t max_backlog)
-{
-	data_writer_t *data = calloc(1, sizeof(*data));
-
-	if (data == NULL) {
-		perror("creating data writer");
-		return NULL;
-	}
-
-	data->proc = sqfs_data_writer_create(super->block_size, cmp,
-					     num_jobs, max_backlog,
-					     devblksize, file);
-	if (data->proc == NULL) {
-		perror("creating data block processor");
-		free(data);
-		return NULL;
-	}
-
-	sqfs_data_writer_set_hooks(data->proc, data, &hooks);
-
-	data->cmp = cmp;
-	data->super = super;
-	return data;
-}
-
-void data_writer_destroy(data_writer_t *data)
-{
-	sqfs_data_writer_destroy(data->proc);
-	free(data);
-}
-
-int data_writer_write_fragment_table(data_writer_t *data)
-{
-	if (sqfs_data_writer_write_fragment_table(data->proc, data->super)) {
-		fputs("error storing fragment table\n", stderr);
-		return -1;
-	}
 	return 0;
 }
-
-int data_writer_sync(data_writer_t *data)
-{
-	return sqfs_data_writer_finish(data->proc);
-}
-
-data_writer_stats_t *data_writer_get_stats(data_writer_t *data)
-{
-	return &data->stats;
-}
diff --git a/lib/sqfshelper/statistics.c b/lib/sqfshelper/statistics.c
index 87efc30..26c121f 100644
--- a/lib/sqfshelper/statistics.c
+++ b/lib/sqfshelper/statistics.c
@@ -7,8 +7,65 @@
 #include "config.h"
 #include "highlevel.h"
 
+#include "sqfs/block.h"
+
 #include <stdio.h>
 
+static void post_block_write(void *user, const sqfs_block_t *block,
+			     sqfs_file_t *file)
+{
+	data_writer_stats_t *stats = user;
+	(void)file;
+
+	if (block->size == 0)
+		return;
+
+	if (block->flags & SQFS_BLK_FRAGMENT_BLOCK) {
+		stats->frag_blocks_written += 1;
+	} else {
+		stats->blocks_written += 1;
+	}
+
+	stats->bytes_written += block->size;
+}
+
+static void pre_fragment_store(void *user, sqfs_block_t *block)
+{
+	data_writer_stats_t *stats = user;
+	(void)block;
+
+	stats->frag_count += 1;
+}
+
+static void notify_blocks_erased(void *user, size_t count, uint64_t bytes)
+{
+	data_writer_stats_t *stats = user;
+
+	stats->bytes_written -= bytes;
+	stats->blocks_written -= count;
+	stats->duplicate_blocks += count;
+}
+
+static void notify_fragment_discard(void *user, const sqfs_block_t *block)
+{
+	data_writer_stats_t *stats = user;
+	(void)block;
+
+	stats->frag_dup += 1;
+}
+
+static const sqfs_block_hooks_t hooks = {
+	.post_block_write = post_block_write,
+	.pre_fragment_store = pre_fragment_store,
+	.notify_blocks_erased = notify_blocks_erased,
+	.notify_fragment_discard = notify_fragment_discard,
+};
+
+void register_stat_hooks(sqfs_data_writer_t *data, data_writer_stats_t *stats)
+{
+	sqfs_data_writer_set_hooks(data, stats, &hooks);
+}
+
 void sqfs_print_statistics(sqfs_super_t *super, data_writer_stats_t *stats)
 {
 	size_t ratio;