root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

xz: Force single-threaded mode when --flush-timeout is used.

This commit is contained in:
Lasse Collin 2014-06-09 21:21:24 +03:00
parent 87f1a24810
commit 8c19216bac
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/xz/coder.c
View File

@ -195,6 +195,17 @@ 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);
// Disable encoder threads when --flush-timeout is used because
// the threaded encoder doesn't support LZMA_SYNC_FLUSH.
// FIXME: When LZMA_SYNC_FLUSH is supported, this should be changed.
if (opt_mode == MODE_COMPRESS && opt_flush_timeout != 0
&& hardware_threads_get() > 1) {
message(V_WARNING, _("Switching to single-threaded mode "
"due to --flush-timeout=%" PRIu64),
opt_flush_timeout);
hardware_threads_set(1);
}
// Get the memory usage. Note that if --format=raw was used, // Get the memory usage. Note that if --format=raw was used,
// we can be decompressing. // we can be decompressing.
const uint64_t memory_limit = hardware_memlimit_get(opt_mode); const uint64_t memory_limit = hardware_memlimit_get(opt_mode);