aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-05-28 20:54:21 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-05-29 03:39:57 +0200
commit23e06428674750c59c17ae2a22d17ecd42056b02 (patch)
tree62fd92a66a10f169b2f9e7e8bcdb72b11bb68027 /include
parent179e4848f2e107c288829b699b7f0a2e7af69c41 (diff)
cleanup: libsqfs: eliminate block writer statistics
- the "bytes submitted" can be moved over to the block processor - the number of blocks submitted are already there (implcitily, by adding the data block count to the fragment block count) - actual data bytes written can be computed from the super block - the remaining block count can be changed to simple counter that can be obtained through a function. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'include')
-rw-r--r--include/sqfs/block_processor.h9
-rw-r--r--include/sqfs/block_writer.h48
2 files changed, 13 insertions, 44 deletions
diff --git a/include/sqfs/block_processor.h b/include/sqfs/block_processor.h
index be10ef0..8b50033 100644
--- a/include/sqfs/block_processor.h
+++ b/include/sqfs/block_processor.h
@@ -69,6 +69,15 @@ struct sqfs_block_processor_stats_t {
sqfs_u64 input_bytes_read;
/**
+ * @brief Total number of bytes sent down to the block processor.
+ *
+ * This is the sum of generated, compressed blocks, including blocks
+ * that were possibly deduplicated by the block writer and not
+ * counting padding that the block writer may have added.
+ */
+ sqfs_u64 output_bytes_generated;
+
+ /**
* @brief Total number of data blocks produced.
*/
sqfs_u64 data_block_count;
diff --git a/include/sqfs/block_writer.h b/include/sqfs/block_writer.h
index 1fd110a..8cfb9a2 100644
--- a/include/sqfs/block_writer.h
+++ b/include/sqfs/block_writer.h
@@ -38,46 +38,6 @@
* This object is not copyable, i.e. @ref sqfs_copy will always return NULL.
*/
-/**
- * @struct sqfs_block_writer_stats_t
- *
- * @brief Collects run time statistics of the @ref sqfs_block_writer_t
- */
-struct sqfs_block_writer_stats_t {
- /**
- * @brief Holds the size of the structure.
- *
- * If a later version of libsquashfs expands this structure, the value
- * of this field can be used to check at runtime whether the newer
- * fields are avaialable or not.
- */
- size_t size;
-
- /**
- * @brief Total number of bytes submitted, including blocks that were
- * removed by deduplication and not counting any padding.
- */
- sqfs_u64 bytes_submitted;
-
- /**
- * @brief Actual number of bytes written to disk, excluding deduplicated
- * blocks and including padding.
- */
- sqfs_u64 bytes_written;
-
- /**
- * @brief Total number of submitted blocks, including ones later
- * removed by deduplication.
- */
- sqfs_u64 blocks_submitted;
-
- /**
- * @brief Total number of blocks actually written, excluding
- * deduplicated blocks.
- */
- sqfs_u64 blocks_written;
-};
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -128,16 +88,16 @@ SQFS_API int sqfs_block_writer_write(sqfs_block_writer_t *wr,
sqfs_u64 *location);
/**
- * @brief Get access to a block writers run time statistics.
+ * @brief Get the number of blocks actually written to disk.
*
* @memberof sqfs_block_writer_t
*
* @param wr A pointer to a block writer.
*
- * @return A pointer to the internal statistics counters.
+ * @return The number of blocks written, excluding deduplicated blocks.
*/
-SQFS_API const sqfs_block_writer_stats_t
-*sqfs_block_writer_get_stats(const sqfs_block_writer_t *wr);
+SQFS_API
+sqfs_u64 sqfs_block_writer_get_block_count(const sqfs_block_writer_t *wr);
#ifdef __cplusplus
}