Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: third_party/tcmalloc/tcmalloc.gyp

Issue 399081: Enable TCMalloc on Linux by default. (Closed)
Patch Set: Oops, remove unintended change. Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome.gyp ('k') | third_party/tcmalloc/tcmalloc_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/tcmalloc/tcmalloc.gyp
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp
index d5ad5a32c97d6186dbcbcc143b04fa9247c948c1..ecc7ab65e3f71140e2f34415f63921fe3a62fcd6 100644
--- a/third_party/tcmalloc/tcmalloc.gyp
+++ b/third_party/tcmalloc/tcmalloc.gyp
@@ -121,6 +121,7 @@
'port.cc',
'system-alloc.h',
'tcmalloc.cc',
+ 'tcmalloc_linux.cc',
'win_allocator.cc',
# jemalloc files
@@ -184,6 +185,9 @@
'tcmalloc/src/page_heap.cc',
'tcmalloc/src/page_heap.h',
+ # don't use linux forked version
+ 'tcmalloc_linux.cc',
+
# heap-profiler/checker/cpuprofiler
'tcmalloc/src/base/thread_lister.c',
'tcmalloc/src/base/thread_lister.h',
@@ -206,6 +210,9 @@
'system-alloc.h',
'win_allocator.cc',
+ # TODO(willchan): unfork this
+ 'tcmalloc/src/tcmalloc.cc',
+
# TODO(willchan): Support allocator shim later on.
'allocator_shim.cc',
« no previous file with comments | « chrome/chrome.gyp ('k') | third_party/tcmalloc/tcmalloc_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698