From c19c426968b44103230d7811eaa44af2cf6f11dd Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Tue, 23 Mar 2021 14:08:32 +0100 Subject: [PATCH] Remove --max-scanner-workers --- doc/mkdwarfs.md | 7 ------- src/mkdwarfs.cpp | 7 ++----- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/doc/mkdwarfs.md b/doc/mkdwarfs.md index 8b9a2b04..2f53932e 100644 --- a/doc/mkdwarfs.md +++ b/doc/mkdwarfs.md @@ -67,13 +67,6 @@ Most other options are concerned with compression tuning: to the number of processors available on your system. Use this option if you want to limit the resources used by `mkdwarfs`. - * `-M`, `--max-scanner-workers=`*value*: - Maximum number of worker threads used for building the filesystem. This - defaults to the number of processors available on your system, but the - number of active workers will be automatically adjusted based on load. - With fast SSDs, scanning multiple files is probably fine, but with older - spinning disks, having less concurrency can improve overall speed. - * `-L`, `--memory-limit=`*value*: Approximately how much memory you want `mkdwarfs` to use during filesystem creation. Note that currently this will only affect the block manager diff --git a/src/mkdwarfs.cpp b/src/mkdwarfs.cpp index b44951a6..4cb7cf88 100644 --- a/src/mkdwarfs.cpp +++ b/src/mkdwarfs.cpp @@ -333,7 +333,7 @@ int mkdwarfs(int argc, char** argv) { std::string path, output, memory_limit, script_arg, compression, schema_compression, metadata_compression, log_level_str, timestamp, time_resolution, order, progress_mode, recompress_opts, pack_metadata; - size_t num_workers, max_scanner_workers; + size_t num_workers; bool no_progress = false, plain_string_tables = false; unsigned level; uint16_t uid, gid; @@ -368,9 +368,6 @@ int mkdwarfs(int argc, char** argv) { ("num-workers,N", po::value(&num_workers)->default_value(num_cpu), "number of writer worker threads") - ("max-scanner-workers,M", - po::value(&max_scanner_workers)->default_value(num_cpu), - "max number of scanner worker threads") ("max-lookback-blocks,B", po::value(&cfg.max_active_blocks)->default_value(1), "how many blocks to scan for segments") @@ -639,7 +636,7 @@ int mkdwarfs(int argc, char** argv) { size_t mem_limit = parse_size_with_unit(memory_limit); worker_group wg_compress("compress", num_workers); - worker_group wg_scanner("scanner", max_scanner_workers); + worker_group wg_scanner("scanner", num_workers); if (no_progress) { progress_mode = "none";