summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 05:21:58 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-12 05:21:58 +0000
commit79fca46610bfd94bca136640cbc614599dcd5ec6 (patch)
tree694c862ba1f02f21c9513d115a7f2e36b5b79621 /base
parentd64f2a0ea7adada3e5221782e4739a9b858c53fd (diff)
downloadchromium_src-79fca46610bfd94bca136640cbc614599dcd5ec6.zip
chromium_src-79fca46610bfd94bca136640cbc614599dcd5ec6.tar.gz
chromium_src-79fca46610bfd94bca136640cbc614599dcd5ec6.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/base.gyp28
-rw-r--r--base/leak_annotations.h2
2 files changed, 10 insertions, 20 deletions
diff --git a/base/base.gyp b/base/base.gyp
index bcb88f6..37ce60b 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -379,30 +379,12 @@
[ '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_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',
- ],
+ [ 'linux_use_tcmalloc==1', {
'defines': [
'LINUX_USE_TCMALLOC',
],
@@ -684,6 +666,14 @@
'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 aa57dff..7e652a5 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) && defined(LINUX_USE_HEAPCHECKER)
+#if defined(LINUX_USE_TCMALLOC)
#include "third_party/tcmalloc/heap-checker.h"