maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[scudo][standalone] Add new mallopt options. 

This adds the code to support calling mallopt and converting the
options to the internal Option enum.

Reviewed By: cryptoad

Differential Revision: https://reviews.llvm.org/D84806
This commit is contained in:
Christopher Ferris 2020-07-28 16:25:49 -07:00 committed by Kostya Kortchinsky
parent 75f222b476
commit f14472a2e3
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler-rt/lib/scudo/standalone/tests/wrappers_c_test.cpp
View File

@ -202,6 +202,12 @@ TEST(ScudoWrappersCTest, MallOpt) {
EXPECT_EQ(mallopt(M_DECAY_TIME, 0), 1);
EXPECT_EQ(mallopt(M_DECAY_TIME, 1), 1);
EXPECT_EQ(mallopt(M_DECAY_TIME, 0), 1);
if (SCUDO_ANDROID) {
EXPECT_EQ(mallopt(M_CACHE_COUNT_MAX, 100), 1);
EXPECT_EQ(mallopt(M_CACHE_SIZE_MAX, 1024 * 1024 * 2), 1);
EXPECT_EQ(mallopt(M_TSDS_COUNT_MAX, 10), 1);
}
}
#endif

25
compiler-rt/lib/scudo/standalone/wrappers_c.inc
View File

@ -155,7 +155,7 @@ void SCUDO_PREFIX(malloc_postinit)() {
SCUDO_PREFIX(malloc_enable));
}
INTERFACE WEAK int SCUDO_PREFIX(mallopt)(int param, UNUSED int value) {
INTERFACE WEAK int SCUDO_PREFIX(mallopt)(int param, int value) {
if (param == M_DECAY_TIME) {
if (SCUDO_ANDROID) {
if (value == 0) {
@ -173,11 +173,26 @@ INTERFACE WEAK int SCUDO_PREFIX(mallopt)(int param, UNUSED int value) {
} else if (param == M_PURGE) {
SCUDO_ALLOCATOR.releaseToOS();
return 1;
} else if (param == M_MEMTAG_TUNING) {
return SCUDO_ALLOCATOR.setOption(scudo::Option::MemtagTuning,
static_cast<scudo::sptr>(value));
} else {
scudo::Option option;
switch (param) {
case M_MEMTAG_TUNING:
option = scudo::Option::MemtagTuning;
break;
case M_CACHE_COUNT_MAX:
option = scudo::Option::MaxCacheEntriesCount;
break;
case M_CACHE_SIZE_MAX:
option = scudo::Option::MaxCacheEntrySize;
break;
case M_TSDS_COUNT_MAX:
option = scudo::Option::MaxTSDsCount;
break;
default:
return 0;
}
return SCUDO_ALLOCATOR.setOption(option, static_cast<scudo::sptr>(value));
}
return 0;
}
INTERFACE WEAK void *SCUDO_PREFIX(aligned_alloc)(size_t alignment,