[NOT TO COMMIT!] Merge Chromium-specific changes in tcmalloc thru. the original gperftools r136.

third_party/tcmalloc/chromium/src/malloc_hook.cc

 // Copyright (c) 2005, Google Inc.
 // All rights reserved.
 // 
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 // 
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 109 matching lines @@
 void InitialPreMMapHook(const void* start,
                                size_t size,
                                int protection,
                                int flags,
                                int fd,
                                off_t offset) {
   perftools_pthread_once(&once, &RemoveInitialHooksAndCallInitializers);
   MallocHook::InvokePreMmapHook(start, size, protection, flags, fd, offset);
 }
 
-void InitialPreSbrkHook(ptrdiff_t increment) {
+void InitialPreSbrkHook(std::ptrdiff_t increment) {
   perftools_pthread_once(&once, &RemoveInitialHooksAndCallInitializers);
   MallocHook::InvokePreSbrkHook(increment);
 }
 
 // This function is called at most once by one of the above initial malloc
 // hooks.  It removes all initial hooks and initializes all other clients that
 // want to get control at the very first memory allocation.  The initializers
 // may assume that the initial malloc hooks have been removed.  The initializers
 // may set up malloc hooks and allocate memory.
 void RemoveInitialHooksAndCallInitializers() {
@@ skipping 433 matching lines @@
 void MallocHook::InvokeMremapHookSlow(const void* result,
                                       const void* old_addr,
                                       size_t old_size,
                                       size_t new_size,
                                       int flags,
                                       const void* new_addr) {
   INVOKE_HOOKS(MremapHook, mremap_hooks_, (result, old_addr, old_size, new_size,
                                            flags, new_addr));
 }
 
-void MallocHook::InvokePreSbrkHookSlow(ptrdiff_t increment) {
+void MallocHook::InvokePreSbrkHookSlow(std::ptrdiff_t increment) {
   INVOKE_HOOKS(PreSbrkHook, presbrk_hooks_, (increment));
 }
 
-void MallocHook::InvokeSbrkHookSlow(const void* result, ptrdiff_t increment) {
+void MallocHook::InvokeSbrkHookSlow(const void* result, std::ptrdiff_t increment) {
   INVOKE_HOOKS(SbrkHook, sbrk_hooks_, (result, increment));
 }
 
 #undef INVOKE_HOOKS
 
 DEFINE_ATTRIBUTE_SECTION_VARS(google_malloc);
 DECLARE_ATTRIBUTE_SECTION_VARS(google_malloc);
   // actual functions are in debugallocation.cc or tcmalloc.cc
 DEFINE_ATTRIBUTE_SECTION_VARS(malloc_hook);
 DECLARE_ATTRIBUTE_SECTION_VARS(malloc_hook);
@@ skipping 115 matching lines @@
 
 /*static*/int MallocHook::UnhookedMUnmap(void *start, size_t length) {
   int result;
   if (!MallocHook::InvokeMunmapReplacement(start, length, &result)) {
     result = munmap(start, length);
   }
   return result;
 }
 
 #endif