Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(815)

Unified Diff: content/app/content_main_runner.cc

Issue 1610153002: Allocator cleanup: move tcmalloc-specific calls to base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_nonbase_tcmalloc_1
Patch Set: rebase Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index ae2de12a14bb7622b3ac9892a6477d1955f8283d..c04782f162f14f5002104ae99092a2c8610220c2 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -115,12 +115,6 @@
#include "crypto/nss_util.h"
#endif
-#if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
-extern "C" {
-int tc_set_new_mode(int mode);
-}
-#endif
-
namespace content {
extern int GpuMain(const content::MainFunctionParams&);
#if defined(ENABLE_PLUGINS)
@@ -150,10 +144,6 @@ base::LazyInstance<ContentUtilityClient>
g_empty_content_utility_client = LAZY_INSTANCE_INITIALIZER;
#endif // !OS_IOS && !CHROME_MULTIPLE_DLL_BROWSER
-#if defined(OS_WIN)
-
-#endif // defined(OS_WIN)
-
#if defined(OS_POSIX) && !defined(OS_IOS)
// Setup signal-handling state: resanitize most signals, ignore SIGPIPE.
@@ -435,16 +425,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
TRACE_EVENT0("startup,benchmark", "ContentMainRunnerImpl::Initialize");
#endif // OS_ANDROID
- // NOTE(willchan): One might ask why these TCMalloc-related calls are done
- // here rather than in process_util_linux.cc with the definition of
- // EnableTerminationOnOutOfMemory(). That's because base shouldn't have a
- // dependency on TCMalloc. Really, we ought to have our allocator shim code
- // implement this EnableTerminationOnOutOfMemory() function. Whateverz.
- // This works for now.
#if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
- // For tcmalloc, we need to tell it to behave like new.
- tc_set_new_mode(1);
-
// 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.

Powered by Google App Engine
This is Rietveld 408576698