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

xz: Always warn if adjusting dictionary size due to memlimit.

This commit is contained in:
Lasse Collin 2010-09-02 19:09:57 +03:00
parent d5653ba8a1
commit b3ff7ba044
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/xz/coder.c
View File

@ -42,10 +42,6 @@ static size_t filters_count = 0;
/// Number of the preset (0-9) /// Number of the preset (0-9)
static size_t preset_number = 6; static size_t preset_number = 6;
/// Indicate if no preset has been explicitly given. In that case, if we need
/// to auto-adjust for lower memory usage, we won't print a warning.
static bool preset_default = true;
/// If a preset is used (no custom filter chain) and preset_extreme is true, /// If a preset is used (no custom filter chain) and preset_extreme is true,
/// a significantly slower compression is used to achieve slightly better /// a significantly slower compression is used to achieve slightly better
/// compression ratio. /// compression ratio.
@ -71,7 +67,6 @@ extern void
coder_set_preset(size_t new_preset) coder_set_preset(size_t new_preset)
{ {
preset_number = new_preset; preset_number = new_preset;
preset_default = false;
return; return;
} }
@ -141,8 +136,6 @@ coder_set_compression_settings(void)
? LZMA_FILTER_LZMA1 : LZMA_FILTER_LZMA2; ? LZMA_FILTER_LZMA1 : LZMA_FILTER_LZMA2;
filters[0].options = &opt_lzma; filters[0].options = &opt_lzma;
filters_count = 1; filters_count = 1;
} else {
preset_default = false;
} }
// Terminate the filter options array. // Terminate the filter options array.
@ -235,18 +228,15 @@ coder_set_compression_settings(void)
} }
// Tell the user that we decreased the dictionary size. // Tell the user that we decreased the dictionary size.
// However, omit the message if no preset or custom chain message(V_WARNING, _("Adjusted LZMA%c dictionary size "
// was given. FIXME: Always warn? "from %s MiB to %s MiB to not exceed "
if (!preset_default) "the memory usage limit of %s MiB"),
message(V_WARNING, _("Adjusted LZMA%c dictionary size " filters[i].id == LZMA_FILTER_LZMA2
"from %s MiB to %s MiB to not exceed " ? '2' : '1',
"the memory usage limit of %s MiB"), uint64_to_str(orig_dict_size >> 20, 0),
filters[i].id == LZMA_FILTER_LZMA2 uint64_to_str(opt->dict_size >> 20, 1),
? '2' : '1', uint64_to_str(round_up_to_mib(
uint64_to_str(orig_dict_size >> 20, 0), memory_limit), 2));
uint64_to_str(opt->dict_size >> 20, 1),
uint64_to_str(round_up_to_mib(
memory_limit), 2));
} }
/* /*