diff options
| author | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 17:13:00 +0000 |
|---|---|---|
| committer | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 17:13:00 +0000 |
| commit | 451c89d68b41da87c3a549f5d3f84f9146018492 (patch) | |
| tree | 72bc5a00adac67d9cd11ba4a286c164a941a5005 /base/debug/profiler.cc | |
| parent | f159a4505dd98e22951b293c7fe377a1e634866e (diff) | |
| download | chromium_src-451c89d68b41da87c3a549f5d3f84f9146018492.zip chromium_src-451c89d68b41da87c3a549f5d3f84f9146018492.tar.gz chromium_src-451c89d68b41da87c3a549f5d3f84f9146018492.tar.bz2 | |
Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes.
This change is retry of r124832. The original review discussion is at http://codereview.chromium.org/9311003/.
The major reason for us is to enable a fix for HEAP_PROFILE_MMAP. The change is created by 3-way merge from 1) the original google-perftools r109 ( = vendor base), 2) the original gperftools 2.0 r144 ( = branch), and 3) the chromium branch ( = another branch) with the following additional changes :
* base/allocator/allocator.gyp is modified.
* Many [#include "third_party/tcmalloc/chromium/src/google/..."] are replaced with "gperftools/". (Many files in Chromium)
* gperftools/tcmalloc.h (formerly google/tcmalloc.h) is replaced with the original (generated) one.
* windows/gperftools/tcmalloc.h (formerly windows/google/tcmalloc.h) is replaced with the original (generated) one.
* malloc_hook-like functions are moved to libc_override*.h in gperftools 2.0. Some changes due to it.
* MALLOC_HOOK_MAYBE_VOLATILE is redefined using __MALLOC_HOOK_VOLATILE. (config.h, tcmalloc.cc and libc_override_glibc.h)
* The macro "CRASH(...)" is replaced with "Log(kCrash, __FILE__, __LINE__, ...)". (Many files)
* LARGE_PAGE-related parameters (which may affect performance?) are merged. (common.h)
* RAW_VLOG() calls are removed. (base/googleinit.h)
* sys_{mmap|munmap|mremap}(...) calls are tentatively replaced with syscall(SYS_{mmap|munmap|mremap}, ...). (malloc_hook_mmap_linux.h)
* tc_mallinfo is declared only when HAVE_STRUCT_MALLINFO is defined. (gperftools/tcmalloc.h)
* "libc_override_redefine.h" is not included in Windows. (libc_override.h)
* Chromium-original "sys_alloc" is not declared. (windows/port.cc)
* base/spinlock_win32-inl.h is reverted from r144 because 64-bit atomicops are not implemented on Windows. (base/atomicops-internals-windows.h)
The vendor branch is updated in another change.
BUG=114302
TEST=run all existing tests.
Review URL: https://chromiumcodereview.appspot.com/9584046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126412 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/debug/profiler.cc')
| -rw-r--r-- | base/debug/profiler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/debug/profiler.cc b/base/debug/profiler.cc index 4195057..e1f2514 100644 --- a/base/debug/profiler.cc +++ b/base/debug/profiler.cc @@ -15,7 +15,7 @@ #endif // defined(OS_WIN) #if defined(ENABLE_PROFILING) && !defined(NO_TCMALLOC) -#include "third_party/tcmalloc/chromium/src/google/profiler.h" +#include "third_party/tcmalloc/chromium/src/gperftools/profiler.h" #endif namespace base { |