diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-08-18 18:57:11 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-08-18 22:44:39 +0200 |
| commit | 58c5d7c933a714096ef0dd42bd1446a6e1a25a16 (patch) | |
| tree | 7d85549573db5af868c5b6877a75490f581ff3ac /mkfs | |
| parent | 64322709a908560f6d08ffc6f50a42f1c1be51dc (diff) | |
Make data writer use block processor
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'mkfs')
| -rw-r--r-- | mkfs/mkfs.c | 3 | ||||
| -rw-r--r-- | mkfs/mkfs.h | 1 | ||||
| -rw-r--r-- | mkfs/options.c | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/mkfs/mkfs.c b/mkfs/mkfs.c index 449fa81..b2bdec2 100644 --- a/mkfs/mkfs.c +++ b/mkfs/mkfs.c @@ -160,7 +160,8 @@ int main(int argc, char **argv) super.bytes_used += ret; } - data = data_writer_create(&super, cmp, outfd, opt.devblksz); + data = data_writer_create(&super, cmp, outfd, + opt.devblksz, opt.num_jobs); if (data == NULL) goto out_cmp; diff --git a/mkfs/mkfs.h b/mkfs/mkfs.h index 16ab887..c73a2c1 100644 --- a/mkfs/mkfs.h +++ b/mkfs/mkfs.h @@ -36,6 +36,7 @@ typedef struct { int blksz; int devblksz; unsigned int dirscan_flags; + unsigned int num_jobs; bool exportable; bool quiet; const char *infile; diff --git a/mkfs/options.c b/mkfs/options.c index 99a7cee..fb50d7b 100644 --- a/mkfs/options.c +++ b/mkfs/options.c @@ -14,6 +14,7 @@ static struct option long_opts[] = { { "comp-extra", required_argument, NULL, 'X' }, { "pack-file", required_argument, NULL, 'F' }, { "pack-dir", required_argument, NULL, 'D' }, + { "num-jobs", required_argument, NULL, 'j' }, { "keep-time", no_argument, NULL, 'k' }, #ifdef HAVE_SYS_XATTR_H { "keep-xattr", no_argument, NULL, 'x' }, @@ -29,7 +30,7 @@ static struct option long_opts[] = { { "help", no_argument, NULL, 'h' }, }; -static const char *short_opts = "F:D:X:c:b:B:d:kxoefqhV" +static const char *short_opts = "F:D:X:c:b:B:d:j:kxoefqhV" #ifdef WITH_SELINUX "s:" #endif @@ -63,6 +64,7 @@ static const char *help_string = " --comp-extra, -X <options> A comma seperated list of extra options for\n" " the selected compressor. Specify 'help' to\n" " get a list of available options.\n" +" --num-jobs, -j <count> Number of compressor jobs to create.\n" " --block-size, -b <size> Block size to use for Squashfs image.\n" " Defaults to %u.\n" " --dev-block-size, -B <size> Device block size to padd the image to.\n" @@ -148,6 +150,7 @@ void process_command_line(options_t *opt, int argc, char **argv) opt->compressor = compressor_get_default(); opt->blksz = SQFS_DEFAULT_BLOCK_SIZE; opt->devblksz = SQFS_DEVBLK_SIZE; + opt->num_jobs = 1; for (;;) { i = getopt_long(argc, argv, short_opts, long_opts, NULL); @@ -173,6 +176,9 @@ void process_command_line(options_t *opt, int argc, char **argv) case 'b': opt->blksz = strtol(optarg, NULL, 0); break; + case 'j': + opt->num_jobs = strtol(optarg, NULL, 0); + break; case 'B': opt->devblksz = strtol(optarg, NULL, 0); if (opt->devblksz < 1024) { |