From 006d30b1a29e2c471a96c0f4658beea8cb86b338 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Mon, 28 Sep 2015 08:16:11 +0200 Subject: by default use the system memory allocator 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 --- sal/rtl/alloc_global.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'sal') diff --git a/sal/rtl/alloc_global.cxx b/sal/rtl/alloc_global.cxx index 60dbc9c85b78..69610630f193 100644 --- a/sal/rtl/alloc_global.cxx +++ b/sal/rtl/alloc_global.cxx @@ -35,7 +35,11 @@ AllocMode alloc_mode = AMode_UNSET; static void determine_alloc_mode() { 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; } /* ================================================================= * -- cgit v1.2.3