Report memory retained by memory allocator internals.

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 <stdlib.h>
 
 #include "base/allocator/allocator_extension.h"
 #include "base/at_exit.h"
@@ skipping 465 matching lines @@
     memset(&sandbox_info_, 0, sizeof(sandbox_info_));
 #endif
   }
 
   ~ContentMainRunnerImpl() {
     if (is_initialized_ && !is_shutdown_)
       Shutdown();
   }
 
 #if defined(USE_TCMALLOC)
-static bool GetPropertyThunk(const char* name, size_t* value) {
-  return MallocExtension::instance()->GetNumericProperty(name, value);
+static bool GetAllocatorWasteSizeThunk(size_t* size) {
+  size_t heap_size, allocated_bytes, unmapped_bytes;
+  MallocExtension* ext = MallocExtension::instance();
+  if (ext->GetNumericProperty("generic.heap_size", &heap_size) &&

[darin (slow to review), 2012/10/23 17:28:30]

nit: Same comment as before.  We shouldn't be hard-coding string literals here. 
Surely these strings appear elsewhere (on the implementation side), so they
should be exposed as constants that we can use in both places.

[alexeif, 2012/10/23 18:00:15]

I'm not sure. These strings are hardcoded in the tcmalloc implementation and not
present in the interface. So the interface of GetNumericProperty is plain
mapping String->Value.
I could go and declare them somewhere in tcmalloc headers... But although we
have a chromium port, anyway it's kinda third-party library. Moreover there will
be no sense to have string constants on one hand and the String->Value interface
on the other. Why not just change it to just Enum->Value then. So I really
wouldn't like to go this way. At least for this CL.

I added a DCHECK for the case when a tcmalloc property is not available.

+      ext->GetNumericProperty("generic.current_allocated_bytes",
+                              &allocated_bytes) &&
+      ext->GetNumericProperty("tcmalloc.pageheap_unmapped_bytes",
+                              &unmapped_bytes)) {
+    *size = heap_size - allocated_bytes - unmapped_bytes;
+    return true;
+  }
+  DCHECK(false);
+  return false;
 }
 
 static void GetStatsThunk(char* buffer, int buffer_length) {
   MallocExtension::instance()->GetStats(buffer, buffer_length);
 }
 
 static void ReleaseFreeMemoryThunk() {
   MallocExtension::instance()->ReleaseFreeMemory();
 }
 #endif
@@ skipping 27 matching lines @@
 #if defined(TYPE_PROFILING)
     base::type_profiler::InterceptFunctions::SetFunctions(
         base::type_profiler::NewInterceptForTCMalloc,
         base::type_profiler::DeleteInterceptForTCMalloc);
 #endif
 
     // For tcmalloc, we need to tell it to behave like new.
     tc_set_new_mode(1);
 
     // On windows, we've already set these thunks up in _heap_init()
-    base::allocator::SetGetPropertyFunction(GetPropertyThunk);
+    base::allocator::SetGetAllocatorWasteSizeFunction(
+        GetAllocatorWasteSizeThunk);
     base::allocator::SetGetStatsFunction(GetStatsThunk);
     base::allocator::SetReleaseFreeMemoryFunction(ReleaseFreeMemoryThunk);
 
     // Provide optional hook for monitoring allocation quantities on a
     // per-thread basis.  Only set the hook if the environment indicates this
     // needs to be enabled.
     const char* profiling = getenv(tracked_objects::kAlternateProfilerTime);
     if (profiling &&
         (atoi(profiling) == tracked_objects::TIME_SOURCE_TYPE_TCMALLOC)) {
       tracked_objects::SetAlternateTimeSource(
@@ skipping 253 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content