mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 17:44:08 +00:00
Code Activity

redo #6242

Browse source 
revert to byte based high watermark
add mb based high watermark
This commit is contained in:
Nikolaj Bjorner 2022-08-08 11:26:18 +03:00
parent 63f48f8fd4
commit 77a313ff76
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/util/env_params.cpp
View file

@ -28,7 +28,10 @@ void env_params::updt_params() {
enable_warning_messages(p.get_bool("warning", true)); enable_warning_messages(p.get_bool("warning", true));
memory::set_max_size(megabytes_to_bytes(p.get_uint("memory_max_size", 0))); memory::set_max_size(megabytes_to_bytes(p.get_uint("memory_max_size", 0)));
memory::set_max_alloc_count(p.get_uint("memory_max_alloc_count", 0)); memory::set_max_alloc_count(p.get_uint("memory_max_alloc_count", 0));
memory::set_high_watermark(megabytes_to_bytes(p.get_uint("memory_high_watermark", 0))); memory::set_high_watermark(p.get_uint("memory_high_watermark", 0));
unsigned mb = p.get_uint("memory_high_watermark_mb", 0);
if (mb > 0)
memory::set_high_watermark(megabytes_to_bytes(mb));
} }
void env_params::collect_param_descrs(param_descrs & d) { void env_params::collect_param_descrs(param_descrs & d) {
@ -36,5 +39,6 @@ void env_params::collect_param_descrs(param_descrs & d) {
d.insert("warning", CPK_BOOL, "enable/disable warning messages", "true"); d.insert("warning", CPK_BOOL, "enable/disable warning messages", "true");
d.insert("memory_max_size", CPK_UINT, "set hard upper limit for memory consumption (in megabytes), if 0 then there is no limit", "0"); d.insert("memory_max_size", CPK_UINT, "set hard upper limit for memory consumption (in megabytes), if 0 then there is no limit", "0");
d.insert("memory_max_alloc_count", CPK_UINT, "set hard upper limit for memory allocations, if 0 then there is no limit", "0"); d.insert("memory_max_alloc_count", CPK_UINT, "set hard upper limit for memory allocations, if 0 then there is no limit", "0");
d.insert("memory_high_watermark", CPK_UINT, "set high watermark for memory consumption (in megabytes), if 0 then there is no limit", "0"); d.insert("memory_high_watermark", CPK_UINT, "set high watermark for memory consumption (in bytes), if 0 then there is no limit", "0");
d.insert("memory_high_watermark_mb", CPK_UINT, "set high watermark for memory consumption (in megabytes), if 0 then there is no limit", "0");
} }