mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

by default use the system memory allocator

Browse Source 
Anything except an unset G_SLICE or the value always-malloc results in
the custom allocator. We might revert that change if it causes issues
but currentlz it looks like our custom allocator performs quite badly in
some situations.

Change-Id: Ib867f7ba0de4d599aa045c28aaab9b644d619beb
This commit is contained in:
Markus Mohrhard
2015-09-28 08:16:11 +02:00
parent 262b5e0b3e
commit 006d30b1a2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sal/rtl/alloc_global.cxx
View File

@@ -35,7 +35,11 @@ AllocMode alloc_mode = AMode_UNSET;
static void determine_alloc_mode() static void determine_alloc_mode()
{ {
assert(alloc_mode == AMode_UNSET); assert(alloc_mode == AMode_UNSET);
alloc_mode = (getenv("G_SLICE") == NULL ? AMode_CUSTOM : AMode_SYSTEM); const char* alloc_string = getenv("G_SLICE");
if (!alloc_string)
alloc_mode = AMode_SYSTEM;
else
alloc_mode = strcmp(alloc_string, "always-malloc") == 0 ? AMode_SYSTEM : AMode_CUSTOM;
} }
/* ================================================================= * /* ================================================================= *