DO NOT COMMIT: Heap profiler for Skia (sk_malloc)

skia/ext/SkMemory_new_handler.cpp

 // 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 <stddef.h>
 #include <stdlib.h>
 
 #include "base/process/memory.h"
 #include "build/build_config.h"
+#include "skia_memory_dump_provider.h"
 #include "third_party/skia/include/core/SkTypes.h"
 
 // This implementation of sk_malloc_flags() and friends is similar to
 // SkMemory_malloc.cpp, except it uses base::UncheckedMalloc and friends
 // for non-SK_MALLOC_THROW calls.
 //
 // The name of this file is historic: a previous implementation tried to
 // use std::set_new_handler() for the same effect, but it didn't actually work.
 
 static inline void* throw_on_failure(size_t size, void* p) {
     if (size > 0 && p == NULL) {
         // If we've got a NULL here, the only reason we should have failed is running out of RAM.
         sk_out_of_memory();
     }
     return p;
 }
 
 void sk_abort_no_print() {
     abort();
 }
 
 void sk_out_of_memory(void) {
     SkASSERT(!"sk_out_of_memory");
     abort();
 }
 
-void* sk_realloc_throw(void* addr, size_t size) {
-    return throw_on_failure(size, realloc(addr, size));
+void* sk_realloc_throw(void* addr, size_t size, const char* typeName) {
+    skia::SkiaAllocHooks::FreeHookIfEnabled(addr);
+    void* new_address = realloc(addr, size);
+    skia::SkiaAllocHooks::AllocationHookIfEnabled(new_address, size, typeName);
+    return throw_on_failure(size, new_address);
 }
 
 void sk_free(void* p) {
     if (p) {
+        skia::SkiaAllocHooks::FreeHookIfEnabled(p);
         free(p);
     }
 }
 
 // We get lots of bugs filed on us that amount to overcommiting bitmap memory,
 // then some time later failing to back that VM with physical memory.
 // They're hard to track down, so in Debug mode we touch all memory right up front.
 //
 // For malloc, fill is an arbitrary byte and ideally not 0.  For calloc, it's got to be 0.
 static void* prevent_overcommit(int fill, size_t size, void* p) {
     // We probably only need to touch one byte per page, but memset makes things easy.
     SkDEBUGCODE(memset(p, fill, size));
     return p;
 }
 
-void* sk_malloc_throw(size_t size) {
-    return prevent_overcommit(0x42, size, throw_on_failure(size, malloc(size)));
+void* sk_malloc_throw(size_t size, const char* typeName) {
+    void* address = throw_on_failure(size, malloc(size));
+    skia::SkiaAllocHooks::AllocationHookIfEnabled(address, size, typeName);
+    return prevent_overcommit(0x42, size, address);
 }
 
-static void* sk_malloc_nothrow(size_t size) {
+static void* sk_malloc_nothrow(size_t size, const char* typeName) {
     // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
     // doesn't work as intended everywhere.
     void* result;
 #if  defined(OS_IOS)
     result = malloc(size);
 #else
     // It's the responsibility of the caller to check the return value.
     ignore_result(base::UncheckedMalloc(size, &result));
 #endif
     if (result) {
         prevent_overcommit(0x47, size, result);
     }
+    skia::SkiaAllocHooks::AllocationHookIfEnabled(result, size, typeName);
     return result;
 }
 
-void* sk_malloc_flags(size_t size, unsigned flags) {
+void* sk_malloc_flags(size_t size, unsigned flags, const char* typeName) {
     if (flags & SK_MALLOC_THROW) {
-        return sk_malloc_throw(size);
+        return sk_malloc_throw(size, typeName);
     }
-    return sk_malloc_nothrow(size);
+    return sk_malloc_nothrow(size, typeName);
 }
 
-void* sk_calloc_throw(size_t size) {
-    return prevent_overcommit(0, size, throw_on_failure(size, calloc(size, 1)));
+void* sk_calloc_throw(size_t size, const char* typeName) {
+    void* address = calloc(size, 1);
+    skia::SkiaAllocHooks::AllocationHookIfEnabled(address, size, typeName);
+    return prevent_overcommit(0, size, throw_on_failure(size, address));
 }
 
-void* sk_calloc(size_t size) {
+void* sk_calloc(size_t size, const char* typeName) {
     // TODO(b.kelemen): we should always use UncheckedCalloc but currently it
     // doesn't work as intended everywhere.
     void* result;
 #if  defined(OS_IOS)
     result = calloc(1, size);
 #else
     // It's the responsibility of the caller to check the return value.
     ignore_result(base::UncheckedCalloc(size, 1, &result));
 #endif
     if (result) {
         prevent_overcommit(0, size, result);
     }
+    skia::SkiaAllocHooks::AllocationHookIfEnabled(result, size, typeName);
     return result;
 }