Allocator cleanup: move tcmalloc-specific calls to base

base/process/memory_linux.cc

 // Copyright (c) 2013 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 "base/process/memory.h"
 
 #include <stddef.h>
 
 #include <new>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/process/internal_linux.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 
 #if defined(USE_TCMALLOC)
-// Used by UncheckedMalloc. If tcmalloc is linked to the executable
-// this will be replaced by a strong symbol that actually implement
-// the semantics and don't call new handler in case the allocation fails.
-extern "C" {
-
-__attribute__((weak, visibility("default")))
-void* tc_malloc_skip_new_handler_weak(size_t size);
-
-void* tc_malloc_skip_new_handler_weak(size_t size) {
-  return malloc(size);
-}
-
-}
+#include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
 #endif
 
 namespace base {
 
 size_t g_oom_size = 0U;
 
 namespace {
 
 #if !defined(OS_ANDROID)
 void OnNoMemorySize(size_t size) {
@@ skipping 113 matching lines @@
 void EnableTerminationOnOutOfMemory() {
 #if defined(OS_ANDROID)
   // Android doesn't support setting a new handler.
   DLOG(WARNING) << "Not feasible.";
 #else
   // Set the new-out of memory handler.
   std::set_new_handler(&OnNoMemory);
   // If we're using glibc's allocator, the above functions will override
   // malloc and friends and make them die on out of memory.
 #endif
+#if defined(USE_TCMALLOC)
+  // For tcmalloc, we need to tell it to behave like new.
+  tc_set_new_mode(1);
+#endif
 }
 
 // NOTE: This is not the only version of this function in the source:
 // the setuid sandbox (in process_util_linux.c, in the sandbox source)
 // also has its own C version.
 bool AdjustOOMScore(ProcessId process, int score) {
   if (score < 0 || score > kMaxOomScore)
     return false;
 
   FilePath oom_path(internal::GetProcPidDir(process));
@@ skipping 26 matching lines @@
   return false;
 }
 
 bool UncheckedMalloc(size_t size, void** result) {
 #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || \
     (!defined(LIBC_GLIBC) && !defined(USE_TCMALLOC))
   *result = malloc(size);
 #elif defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)
   *result = __libc_malloc(size);
 #elif defined(USE_TCMALLOC)
-  *result = tc_malloc_skip_new_handler_weak(size);
+  *result = tc_malloc_skip_new_handler(size);
 #endif
   return *result != NULL;
 }
 
 }  // namespace base