Report memory retained by memory allocator internals.

content/app/content_main_runner.cc

Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 13ee1bc08a6e00f0ea29090813f019ffa81b10d5..869b6121ea44371e6d88aa138e00b9025642f7a6 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -483,8 +483,19 @@ class ContentMainRunnerImpl : public ContentMainRunner {
   }
 
 #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) {
@@ -532,7 +543,8 @@ static void ReleaseFreeMemoryThunk() {
     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);