From 451c89d68b41da87c3a549f5d3f84f9146018492 Mon Sep 17 00:00:00 2001 From: "dmikurube@chromium.org" Date: Tue, 13 Mar 2012 17:13:00 +0000 Subject: 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 --- chrome/browser/browser_about_handler.cc | 2 +- chrome/browser/chromeos/status/memory_menu_button.cc | 2 +- chrome/browser/memory_purger.cc | 2 +- chrome/browser/ui/webui/about_ui.cc | 2 +- chrome/renderer/chrome_render_process_observer.cc | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 216dc2b..5d05df5 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -17,7 +17,7 @@ #include "content/public/browser/sensors_provider.h" #if defined(USE_TCMALLOC) -#include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" +#include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h" #endif namespace { diff --git a/chrome/browser/chromeos/status/memory_menu_button.cc b/chrome/browser/chromeos/status/memory_menu_button.cc index f555e9a..652a15f 100644 --- a/chrome/browser/chromeos/status/memory_menu_button.cc +++ b/chrome/browser/chromeos/status/memory_menu_button.cc @@ -24,7 +24,7 @@ #include "ui/views/widget/widget.h" #if defined(USE_TCMALLOC) -#include "third_party/tcmalloc/chromium/src/google/heap-profiler.h" +#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" #endif #if defined(USE_TCMALLOC) diff --git a/chrome/browser/memory_purger.cc b/chrome/browser/memory_purger.cc index f3f6272..8e1d9a1 100644 --- a/chrome/browser/memory_purger.cc +++ b/chrome/browser/memory_purger.cc @@ -22,7 +22,7 @@ #include "net/proxy/proxy_service.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" -#include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" +#include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h" using content::BrowserContext; using content::BrowserThread; diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 4b754a0..b57b3ed 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -87,7 +87,7 @@ #endif #if defined(USE_TCMALLOC) -#include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" +#include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h" #endif using base::Time; diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc index e6c36e8..2ec16dd 100644 --- a/chrome/renderer/chrome_render_process_observer.cc +++ b/chrome/renderer/chrome_render_process_observer.cc @@ -32,8 +32,8 @@ #include "net/base/net_errors.h" #include "net/base/net_module.h" #include "third_party/sqlite/sqlite3.h" -#include "third_party/tcmalloc/chromium/src/google/heap-profiler.h" -#include "third_party/tcmalloc/chromium/src/google/malloc_extension.h" +#include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h" +#include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebCrossOriginPreflightResultCache.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" -- cgit v1.1