mirror of
https://git.tukaani.org/xz.git
synced 2024-04-04 12:36:23 +02:00
xz: Add support for threaded compression.
This commit is contained in:
parent
de678e0c92
commit
24e0406c0f
2 changed files with 124 additions and 79 deletions
|
@ -179,8 +179,9 @@ parse_real(args_info *args, int argc, char **argv)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'T':
|
case 'T':
|
||||||
|
// The max is from src/liblzma/common/common.h.
|
||||||
hardware_threads_set(str_to_uint64("threads",
|
hardware_threads_set(str_to_uint64("threads",
|
||||||
optarg, 0, LZMA_THREADS_MAX));
|
optarg, 0, 16384));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// --version
|
// --version
|
||||||
|
|
124
src/xz/coder.c
124
src/xz/coder.c
|
@ -55,6 +55,14 @@ static lzma_check check;
|
||||||
/// This becomes false if the --check=CHECK option is used.
|
/// This becomes false if the --check=CHECK option is used.
|
||||||
static bool check_default = true;
|
static bool check_default = true;
|
||||||
|
|
||||||
|
#ifdef HAVE_PTHREAD
|
||||||
|
static lzma_mt mt_options = {
|
||||||
|
.flags = 0,
|
||||||
|
.timeout = 300,
|
||||||
|
.filters = filters,
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
extern void
|
extern void
|
||||||
coder_set_check(lzma_check new_check)
|
coder_set_check(lzma_check new_check)
|
||||||
|
@ -117,6 +125,15 @@ memlimit_too_small(uint64_t memory_usage)
|
||||||
extern void
|
extern void
|
||||||
coder_set_compression_settings(void)
|
coder_set_compression_settings(void)
|
||||||
{
|
{
|
||||||
|
// The default check type is CRC64, but fallback to CRC32
|
||||||
|
// if CRC64 isn't supported by the copy of liblzma we are
|
||||||
|
// using. CRC32 is always supported.
|
||||||
|
if (check_default) {
|
||||||
|
check = LZMA_CHECK_CRC64;
|
||||||
|
if (!lzma_check_is_supported(check))
|
||||||
|
check = LZMA_CHECK_CRC32;
|
||||||
|
}
|
||||||
|
|
||||||
// Options for LZMA1 or LZMA2 in case we are using a preset.
|
// Options for LZMA1 or LZMA2 in case we are using a preset.
|
||||||
static lzma_options_lzma opt_lzma;
|
static lzma_options_lzma opt_lzma;
|
||||||
|
|
||||||
|
@ -170,15 +187,26 @@ coder_set_compression_settings(void)
|
||||||
// Print the selected filter chain.
|
// Print the selected filter chain.
|
||||||
message_filters_show(V_DEBUG, filters);
|
message_filters_show(V_DEBUG, filters);
|
||||||
|
|
||||||
// If using --format=raw, we can be decoding. The memusage function
|
// Get the memory usage. Note that if --format=raw was used,
|
||||||
// also validates the filter chain and the options used for the
|
// we can be decompressing.
|
||||||
// filters.
|
|
||||||
const uint64_t memory_limit = hardware_memlimit_get(opt_mode);
|
const uint64_t memory_limit = hardware_memlimit_get(opt_mode);
|
||||||
uint64_t memory_usage;
|
uint64_t memory_usage;
|
||||||
if (opt_mode == MODE_COMPRESS)
|
if (opt_mode == MODE_COMPRESS) {
|
||||||
|
#ifdef HAVE_PTHREAD
|
||||||
|
if (opt_format == FORMAT_XZ && hardware_threads_get() > 1) {
|
||||||
|
mt_options.threads = hardware_threads_get();
|
||||||
|
mt_options.block_size = opt_block_size;
|
||||||
|
mt_options.check = check;
|
||||||
|
memory_usage = lzma_stream_encoder_mt_memusage(
|
||||||
|
&mt_options);
|
||||||
|
} else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
memory_usage = lzma_raw_encoder_memusage(filters);
|
memory_usage = lzma_raw_encoder_memusage(filters);
|
||||||
else
|
}
|
||||||
|
} else {
|
||||||
memory_usage = lzma_raw_decoder_memusage(filters);
|
memory_usage = lzma_raw_decoder_memusage(filters);
|
||||||
|
}
|
||||||
|
|
||||||
if (memory_usage == UINT64_MAX)
|
if (memory_usage == UINT64_MAX)
|
||||||
message_fatal(_("Unsupported filter chain or filter options"));
|
message_fatal(_("Unsupported filter chain or filter options"));
|
||||||
|
@ -194,7 +222,9 @@ coder_set_compression_settings(void)
|
||||||
round_up_to_mib(decmem), 0));
|
round_up_to_mib(decmem), 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (memory_usage > memory_limit) {
|
if (memory_usage <= memory_limit)
|
||||||
|
return;
|
||||||
|
|
||||||
// If --no-auto-adjust was used or we didn't find LZMA1 or
|
// If --no-auto-adjust was used or we didn't find LZMA1 or
|
||||||
// LZMA2 as the last filter, give an error immediately.
|
// LZMA2 as the last filter, give an error immediately.
|
||||||
// --format=raw implies --no-auto-adjust.
|
// --format=raw implies --no-auto-adjust.
|
||||||
|
@ -203,9 +233,40 @@ coder_set_compression_settings(void)
|
||||||
|
|
||||||
assert(opt_mode == MODE_COMPRESS);
|
assert(opt_mode == MODE_COMPRESS);
|
||||||
|
|
||||||
// Look for the last filter if it is LZMA2 or LZMA1, so
|
#ifdef HAVE_PTHREAD
|
||||||
// we can make it use less RAM. With other filters we don't
|
if (opt_format == FORMAT_XZ && mt_options.threads > 1) {
|
||||||
// know what to do.
|
// Try to reduce the number of threads before
|
||||||
|
// adjusting the compression settings down.
|
||||||
|
do {
|
||||||
|
// FIXME? The real single-threaded mode has
|
||||||
|
// lower memory usage, but it's not comparable
|
||||||
|
// because it doesn't write the size info
|
||||||
|
// into Block Headers.
|
||||||
|
if (--mt_options.threads == 0)
|
||||||
|
memlimit_too_small(memory_usage);
|
||||||
|
|
||||||
|
memory_usage = lzma_stream_encoder_mt_memusage(
|
||||||
|
&mt_options);
|
||||||
|
if (memory_usage == UINT64_MAX)
|
||||||
|
message_bug();
|
||||||
|
|
||||||
|
} while (memory_usage > memory_limit);
|
||||||
|
|
||||||
|
message(V_WARNING, _("Adjusted the number of threads "
|
||||||
|
"from %s to %s to not exceed "
|
||||||
|
"the memory usage limit of %s MiB"),
|
||||||
|
uint64_to_str(hardware_threads_get(), 0),
|
||||||
|
uint64_to_str(mt_options.threads, 1),
|
||||||
|
uint64_to_str(round_up_to_mib(
|
||||||
|
memory_limit), 2));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (memory_usage <= memory_limit)
|
||||||
|
return;
|
||||||
|
|
||||||
|
// Look for the last filter if it is LZMA2 or LZMA1, so we can make
|
||||||
|
// it use less RAM. With other filters we don't know what to do.
|
||||||
size_t i = 0;
|
size_t i = 0;
|
||||||
while (filters[i].id != LZMA_FILTER_LZMA2
|
while (filters[i].id != LZMA_FILTER_LZMA2
|
||||||
&& filters[i].id != LZMA_FILTER_LZMA1) {
|
&& filters[i].id != LZMA_FILTER_LZMA1) {
|
||||||
|
@ -221,10 +282,9 @@ coder_set_compression_settings(void)
|
||||||
const uint32_t orig_dict_size = opt->dict_size;
|
const uint32_t orig_dict_size = opt->dict_size;
|
||||||
opt->dict_size &= ~((UINT32_C(1) << 20) - 1);
|
opt->dict_size &= ~((UINT32_C(1) << 20) - 1);
|
||||||
while (true) {
|
while (true) {
|
||||||
// If it is below 1 MiB, auto-adjusting failed. We
|
// If it is below 1 MiB, auto-adjusting failed. We could be
|
||||||
// could be more sophisticated and scale it down even
|
// more sophisticated and scale it down even more, but let's
|
||||||
// more, but let's see if many complain about this
|
// see if many complain about this version.
|
||||||
// version.
|
|
||||||
//
|
//
|
||||||
// FIXME: Displays the scaled memory usage instead
|
// FIXME: Displays the scaled memory usage instead
|
||||||
// of the original.
|
// of the original.
|
||||||
|
@ -253,30 +313,7 @@ coder_set_compression_settings(void)
|
||||||
? '2' : '1',
|
? '2' : '1',
|
||||||
uint64_to_str(orig_dict_size >> 20, 0),
|
uint64_to_str(orig_dict_size >> 20, 0),
|
||||||
uint64_to_str(opt->dict_size >> 20, 1),
|
uint64_to_str(opt->dict_size >> 20, 1),
|
||||||
uint64_to_str(round_up_to_mib(
|
uint64_to_str(round_up_to_mib(memory_limit), 2));
|
||||||
memory_limit), 2));
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
// Limit the number of worker threads so that memory usage
|
|
||||||
// limit isn't exceeded.
|
|
||||||
assert(memory_usage > 0);
|
|
||||||
size_t thread_limit = memory_limit / memory_usage;
|
|
||||||
if (thread_limit == 0)
|
|
||||||
thread_limit = 1;
|
|
||||||
|
|
||||||
if (opt_threads > thread_limit)
|
|
||||||
opt_threads = thread_limit;
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (check_default) {
|
|
||||||
// The default check type is CRC64, but fallback to CRC32
|
|
||||||
// if CRC64 isn't supported by the copy of liblzma we are
|
|
||||||
// using. CRC32 is always supported.
|
|
||||||
check = LZMA_CHECK_CRC64;
|
|
||||||
if (!lzma_check_is_supported(check))
|
|
||||||
check = LZMA_CHECK_CRC32;
|
|
||||||
}
|
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -356,7 +393,14 @@ coder_init(file_pair *pair)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case FORMAT_XZ:
|
case FORMAT_XZ:
|
||||||
ret = lzma_stream_encoder(&strm, filters, check);
|
#ifdef HAVE_PTHREAD
|
||||||
|
if (hardware_threads_get() > 1)
|
||||||
|
ret = lzma_stream_encoder_mt(
|
||||||
|
&strm, &mt_options);
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
ret = lzma_stream_encoder(
|
||||||
|
&strm, filters, check);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case FORMAT_LZMA:
|
case FORMAT_LZMA:
|
||||||
|
@ -477,8 +521,8 @@ coder_normal(file_pair *pair)
|
||||||
// to the .xz format. If block_remaining == UINT64_MAX, only
|
// to the .xz format. If block_remaining == UINT64_MAX, only
|
||||||
// a single block is created.
|
// a single block is created.
|
||||||
uint64_t block_remaining = UINT64_MAX;
|
uint64_t block_remaining = UINT64_MAX;
|
||||||
if (opt_mode == MODE_COMPRESS && opt_format == FORMAT_XZ
|
if (hardware_threads_get() == 1 && opt_mode == MODE_COMPRESS
|
||||||
&& opt_block_size > 0)
|
&& opt_format == FORMAT_XZ && opt_block_size > 0)
|
||||||
block_remaining = opt_block_size;
|
block_remaining = opt_block_size;
|
||||||
|
|
||||||
strm.next_out = out_buf.u8;
|
strm.next_out = out_buf.u8;
|
||||||
|
|
Loading…
Reference in a new issue