summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-04-29 20:07:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-04-29 20:07:45 +0000
commit4515d3be41056889ce4cba7513f2eff62fcecccc (patch)
tree9b37a20091e43640d27289a05712fb880bdaf020
parentcd4c5c31292bc0ecbb63914cf073251ff1f371d0 (diff)
parent3e82e9b13867be1231c2dc8554980bbb6f93ef86 (diff)
downloadscudo-master.tar.gz
Merge "[scudo] Change the default MinReleaseToOsIntervalMs to -1" into mainHEADmastermain
-rw-r--r--config/custom_scudo_config.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/config/custom_scudo_config.h b/config/custom_scudo_config.h
index 5e85d0fe1a7..26f590e3c25 100644
--- a/config/custom_scudo_config.h
+++ b/config/custom_scudo_config.h
@@ -107,8 +107,9 @@ struct AndroidNormalConfig {
static const uptr GroupSizeLog = 18U;
typedef uptr CompactPtrT;
#endif
- static const s32 MinReleaseToOsIntervalMs = 1000;
+ static const s32 MinReleaseToOsIntervalMs = -1;
static const s32 MaxReleaseToOsIntervalMs = 1000;
+ static const s32 DefaultReleaseToOsIntervalMs = 1000;
};
#if SCUDO_CAN_USE_PRIMARY64
template <typename Config> using PrimaryT = SizeClassAllocator64<Config>;
@@ -122,8 +123,9 @@ struct AndroidNormalConfig {
static const u32 QuarantineSize = 32U;
static const u32 DefaultMaxEntriesCount = 32U;
static const uptr DefaultMaxEntrySize = 2UL << 20;
- static const s32 MinReleaseToOsIntervalMs = 0;
+ static const s32 MinReleaseToOsIntervalMs = -1;
static const s32 MaxReleaseToOsIntervalMs = 1000;
+ static const s32 DefaultReleaseToOsIntervalMs = 0;
};
template <typename Config> using CacheT = MapAllocatorCache<Config>;
};