Route calls to tcmalloc MallocExtension through allocator agnostic interface

content/app/content_main_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/app/content_main_runner.h"
 
+#include "base/allocator/allocator_extension.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/debug/trace_event.h"
 #include "base/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/stats_table.h"
 #include "base/path_service.h"
@@ skipping 13 matching lines @@
 #include "content/public/common/url_constants.h"
 #include "crypto/nss_util.h"
 #include "ipc/ipc_switches.h"
 #include "media/base/media.h"
 #include "sandbox/src/sandbox_types.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/win/dpi.h"
 #include "webkit/glue/webkit_glue.h"
 
+#if defined(USE_TCMALLOC)
+#include "third_party/tcmalloc/chromium/src/gperftools/malloc_extension.h"
+#endif
+
 #if defined(OS_WIN)
 #include <atlbase.h>
 #include <atlapp.h>
 #include <malloc.h>
 #elif defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/mach_ipc_mac.h"
 #include "base/system_monitor/system_monitor.h"
 #include "content/browser/mach_broker_mac.h"
 #include "content/common/sandbox_init_mac.h"
@@ skipping 257 matching lines @@
       : is_initialized_(false),
         is_shutdown_(false),
         completed_basic_startup_(false) {
   }
 
   ~ContentMainRunnerImpl() {
     if (is_initialized_ && !is_shutdown_)
       Shutdown();
   }
 
+#if defined(USE_TCMALLOC)
+static void get_stats_thunk(char* buffer, int buffer_length) {

[jam, 2012/04/26 21:28:20]

nit: chrome style is GetStatsThunk. also below

+    MallocExtension::instance()->GetStats(buffer, buffer_length);

[jam, 2012/04/26 21:28:20]

nit: 2 spaces.. also below

+}
+
+static void release_free_memory_thunk() {
+    MallocExtension::instance()->ReleaseFreeMemory();
+}
+#endif
+
+
 #if defined(OS_WIN)
   virtual int Initialize(HINSTANCE instance,
                          sandbox::SandboxInterfaceInfo* sandbox_info,
                          content::ContentMainDelegate* delegate) OVERRIDE {
     // argc/argv are ignored on Windows; see command_line.h for details.
     int argc = 0;
     char** argv = NULL;
 
     content::RegisterInvalidParamHandler();
     _Module.Init(NULL, static_cast<HINSTANCE>(instance));
@@ skipping 11 matching lines @@
     // process_util_linux.cc with the definition of
     // EnableTerminationOnOutOfMemory().  That's because base shouldn't have a
     // dependency on TCMalloc.  Really, we ought to have our allocator shim code
     // implement this EnableTerminationOnOutOfMemory() function.  Whateverz.
     // This works for now.
 #if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
     // For tcmalloc, we need to tell it to behave like new.
     tc_set_new_mode(1);
 #endif
 
+    // On windows, we've already set these thunks up in _heap_init()
+#if !defined(OS_WIN) && defined(USE_TCMALLOC)

[jam, 2012/04/26 21:28:20]

nit: if you don't want windows, then move this up inside the second part of the
ifdef above

+    base::allocator::SetGetStatsFunction(get_stats_thunk);
+    base::allocator::SetReleaseFreeMemoryFunction(release_free_memory_thunk);
+#endif
+
 #if !defined(OS_ANDROID)
     // Set C library locale to make sure CommandLine can parse argument values
     // in correct encoding.
     setlocale(LC_ALL, "");
 #endif
 
     SetupSignalHandlers();
 
     base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetInstance();
     g_fds->Set(kPrimaryIPCChannel,
@@ skipping 226 matching lines @@
 }  // namespace
 
 namespace content {
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content