diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 05:58:58 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-12 05:58:58 +0000 |
| commit | 2c55605be6272ecca5a8131fee4bca8e92e55106 (patch) | |
| tree | 91c42eb003f7f1e408c070397b32b8d5cf73aacd /base | |
| parent | 6f01a42815ab057ae5909d3eeaf9268c4105d215 (diff) | |
| download | chromium_src-2c55605be6272ecca5a8131fee4bca8e92e55106.zip chromium_src-2c55605be6272ecca5a8131fee4bca8e92e55106.tar.gz chromium_src-2c55605be6272ecca5a8131fee4bca8e92e55106.tar.bz2 | |
Revert 31765 - Experiment: enable TCMalloc on Linux by default.
Will revert after looking at the Linux memory bot and perf cycler.
TBR=willchan
Review URL: http://codereview.chromium.org/386016
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/384074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gyp | 28 | ||||
| -rw-r--r-- | base/leak_annotations.h | 2 |
2 files changed, 20 insertions, 10 deletions
diff --git a/base/base.gyp b/base/base.gyp index 37ce60b..bcb88f6 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -379,12 +379,30 @@ [ 'OS == "linux" or OS == "freebsd"', { 'sources/': [ ['exclude', '_(mac|win|chromeos)\\.cc$'], ['exclude', '\\.mm?$' ] ], + 'variables' : { + 'linux_use_heapchecker%' : 0, + }, 'conditions': [ [ 'chromeos==1 or toolkit_views==1', { 'sources/': [ ['include', '_chromeos\\.cc$'] ] }, ], - [ 'linux_use_tcmalloc==1', { + [ 'linux_use_heapchecker==1', { + 'defines': [ + 'LINUX_USE_HEAPCHECKER', + ], + 'direct_dependent_settings': { + 'defines': [ + 'LINUX_USE_HEAPCHECKER', + ], + }, + }, + ], + # linux_use_heapchecker==1 implies linux_use_tcmalloc=1. + [ 'linux_use_tcmalloc==1 or linux_use_heapchecker==1', { + 'dependencies': [ + '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', + ], 'defines': [ 'LINUX_USE_TCMALLOC', ], @@ -666,14 +684,6 @@ 'file_version_info_unittest.cc', 'worker_pool_linux_unittest.cc', ], - 'conditions': [ - [ 'linux_use_tcmalloc==1', { - 'dependencies': [ - '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc', - ], - }, - ], - ], 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', diff --git a/base/leak_annotations.h b/base/leak_annotations.h index 7e652a5..aa57dff 100644 --- a/base/leak_annotations.h +++ b/base/leak_annotations.h @@ -5,7 +5,7 @@ #ifndef BASE_LEAK_ANNOTATIONS_H_ #define BASE_LEAK_ANNOTATIONS_H_ -#if defined(LINUX_USE_TCMALLOC) +#if defined(LINUX_USE_TCMALLOC) && defined(LINUX_USE_HEAPCHECKER) #include "third_party/tcmalloc/heap-checker.h" |