diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-10-01 07:38:47 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-10-01 07:38:47 +0200 |
| commit | 6e8e898acb9f6825104f01d090f447e8dfc7e4a2 (patch) | |
| tree | 487707d3afb5c1da6e3e87869f48c99162f28538 /sal | |
| parent | tdf#92702 Unable to select menu items that were initially off-screen (diff) | |
| download | core-6e8e898acb9f6825104f01d090f447e8dfc7e4a2.tar.gz core-6e8e898acb9f6825104f01d090f447e8dfc7e4a2.zip | |
Revert "by default use the system memory allocator"
It seems that even on Linux the system allocator is worse than our
internal allocator. e.g:
http://perf.libreoffice.org/perf_html/chitest_of_cppu_sc_on_vm139.details.html
This reverts commit 006d30b1a29e2c471a96c0f4658beea8cb86b338.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/alloc_global.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sal/rtl/alloc_global.cxx b/sal/rtl/alloc_global.cxx index 69610630f193..60dbc9c85b78 100644 --- a/sal/rtl/alloc_global.cxx +++ b/sal/rtl/alloc_global.cxx @@ -35,11 +35,7 @@ AllocMode alloc_mode = AMode_UNSET; static void determine_alloc_mode() { assert(alloc_mode == AMode_UNSET); - 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; + alloc_mode = (getenv("G_SLICE") == NULL ? AMode_CUSTOM : AMode_SYSTEM); } /* ================================================================= * |