diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-17 07:59:58 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-17 07:59:58 +0000 |
| commit | b6081702c2cb8094e45c3a58ea92915d4b972ddf (patch) | |
| tree | c2229158e90a3342b986dfa1562a4607b7a57c9f /base | |
| parent | ad26ef4a0c0a170f4a167eea95aed749b791cc95 (diff) | |
| download | chromium_src-b6081702c2cb8094e45c3a58ea92915d4b972ddf.zip chromium_src-b6081702c2cb8094e45c3a58ea92915d4b972ddf.tar.gz chromium_src-b6081702c2cb8094e45c3a58ea92915d4b972ddf.tar.bz2 | |
Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor)
with the forked Chromium version of tcmalloc.
This change also requires some fixes to base/allocator/allocator.gyp: new tcmalloc
source files added, unittest_utils.cc disabled (tcmalloc has its own snprintf()
implementation now)
Review URL: http://codereview.chromium.org/7050034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89452 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/allocator/allocator.gyp | 10 | ||||
| -rw-r--r-- | base/allocator/allocator_shim.cc | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index cfa7f92d..5b6ebea 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -48,8 +48,12 @@ # all tcmalloc native and forked files '<(tcmalloc_dir)/src/addressmap-inl.h', '<(tcmalloc_dir)/src/base/atomicops-internals-linuxppc.h', + '<(tcmalloc_dir)/src/base/arm_instruction_set_select.h', + '<(tcmalloc_dir)/src/base/atomicops-internals-arm-gcc.h', + '<(tcmalloc_dir)/src/base/atomicops-internals-arm-generic.h', + '<(tcmalloc_dir)/src/base/atomicops-internals-arm-v6plus.h', '<(tcmalloc_dir)/src/base/atomicops-internals-macosx.h', - '<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h', + '<(tcmalloc_dir)/src/base/atomicops-internals-windows.h', '<(tcmalloc_dir)/src/base/atomicops-internals-x86.cc', '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h', '<(tcmalloc_dir)/src/base/atomicops.h', @@ -71,10 +75,13 @@ '<(tcmalloc_dir)/src/base/simple_mutex.h', '<(tcmalloc_dir)/src/base/spinlock.cc', '<(tcmalloc_dir)/src/base/spinlock.h', + '<(tcmalloc_dir)/src/base/spinlock_internal.cc', + '<(tcmalloc_dir)/src/base/spinlock_internal.h', '<(tcmalloc_dir)/src/base/spinlock_linux-inl.h', '<(tcmalloc_dir)/src/base/spinlock_posix-inl.h', '<(tcmalloc_dir)/src/base/spinlock_win32-inl.h', '<(tcmalloc_dir)/src/base/stl_allocator.h', + '<(tcmalloc_dir)/src/base/src/synchronization_profiling.h', '<(tcmalloc_dir)/src/base/sysinfo.cc', '<(tcmalloc_dir)/src/base/sysinfo.h', '<(tcmalloc_dir)/src/base/thread_annotations.h', @@ -392,7 +399,6 @@ '../..', ], 'sources': [ - 'unittest_utils.cc', 'allocator_unittests.cc', ], }, diff --git a/base/allocator/allocator_shim.cc b/base/allocator/allocator_shim.cc index caf6d7e..b7973e8 100644 --- a/base/allocator/allocator_shim.cc +++ b/base/allocator/allocator_shim.cc @@ -5,6 +5,7 @@ #include "base/allocator/allocator_shim.h" #include <config.h> +#include "base/sysinfo.h" // When defined, different heap allocators can be used via an environment // variable set before running the program. This may reduce the amount |