diff options
| author | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-01 00:25:41 +0000 |
|---|---|---|
| committer | jar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-01 00:25:41 +0000 |
| commit | e94afbb913b95f512cb8745a2729c73f82b15ae7 (patch) | |
| tree | a6743a8f89cb44c6a5873c87706e83203fc05303 /third_party/tcmalloc/tcmalloc.gyp | |
| parent | e0bf7382ae532696f850d41a131509a9cae5f215 (diff) | |
| download | chromium_src-e94afbb913b95f512cb8745a2729c73f82b15ae7.zip chromium_src-e94afbb913b95f512cb8745a2729c73f82b15ae7.tar.gz chromium_src-e94afbb913b95f512cb8745a2729c73f82b15ae7.tar.bz2 | |
Rollback Scavenge implemetation and rely on existing functionality to free
This is a landing of a patch provided by antonm. See:
http://codereview.chromium.org/235022
Also included change to browser_about_handler.cc to fix build, and I set
TCMALLOC_RELEASE_RATE to 1.0 on line 40 of page_heap.cc (I think this
was an inadvertent rollback element).
r=antonm
Review URL: http://codereview.chromium.org/257009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27692 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc/tcmalloc.gyp')
| -rw-r--r-- | third_party/tcmalloc/tcmalloc.gyp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp index ee06a98..f53e730 100644 --- a/third_party/tcmalloc/tcmalloc.gyp +++ b/third_party/tcmalloc/tcmalloc.gyp @@ -76,6 +76,8 @@ 'tcmalloc/src/linked_list.h', 'tcmalloc/src/malloc_hook.cc', 'tcmalloc/src/malloc_hook-inl.h', + 'tcmalloc/src/malloc_extension.cc', + 'tcmalloc/src/google/malloc_extension.h', 'tcmalloc/src/page_heap.cc', 'tcmalloc/src/page_heap.h', 'tcmalloc/src/port.h', @@ -123,8 +125,6 @@ # tcmalloc forked files 'allocator_shim.cc', 'generic_allocators.cc', - 'malloc_extension.cc', - 'google/malloc_extension.h', 'page_heap.cc', 'page_heap.h', 'port.cc', @@ -146,8 +146,6 @@ 'generic_allocators.cc', 'tcmalloc.cc', 'win_allocator.cc', - 'tcmalloc/src/malloc_extension.cc', - 'tcmalloc/src/google/malloc_extension.h', ], 'msvs_settings': { # TODO(sgk): merge this with build/common.gypi settings |