[tracing] Allow enabling heap profiling from chrome://flags

BUG=684839 Review-Url: https://codereview.chromium.org/2847823004 Cr-Commit-Position: refs/heads/master@{#468462}
feiyue1206 · May 1, 2017 · c6376a6 · c6376a6
1 parent 54d7621
commit c6376a6
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 1 deletion.
diff --git a/base/base_switches.cc b/base/base_switches.cc
@@ -20,6 +20,10 @@ const char kEnableCrashReporter[]           = "enable-crash-reporter";
 // the memory-infra category is enabled.
 const char kEnableHeapProfiling[]           = "enable-heap-profiling";
 
+// Report pseudo allocation traces. Pseudo traces are derived from currently
+// active trace events.
+const char kEnableHeapProfilingModePseudo[] = "";
+
 // Report native (walk the stack) allocation traces. By default pseudo stacks
 // derived from trace events are reported.
 const char kEnableHeapProfilingModeNative[] = "native";

diff --git a/base/base_switches.h b/base/base_switches.h
@@ -15,6 +15,7 @@ extern const char kDisableBreakpad[];
 extern const char kDisableLowEndDeviceMode[];
 extern const char kEnableCrashReporter[];
 extern const char kEnableHeapProfiling[];
+extern const char kEnableHeapProfilingModePseudo[];
 extern const char kEnableHeapProfilingModeNative[];
 extern const char kEnableHeapProfilingTaskProfiler[];
 extern const char kEnableLowEndDeviceMode[];

diff --git a/base/trace_event/memory_dump_manager.cc b/base/trace_event/memory_dump_manager.cc
@@ -187,7 +187,7 @@ void MemoryDumpManager::EnableHeapProfilingIfNeeded() {
 
   std::string profiling_mode = CommandLine::ForCurrentProcess()
       ->GetSwitchValueASCII(switches::kEnableHeapProfiling);
-  if (profiling_mode == "") {
+  if (profiling_mode == switches::kEnableHeapProfilingModePseudo) {
     AllocationContextTracker::SetCaptureMode(
         AllocationContextTracker::CaptureMode::PSEUDO_STACK);
 #if !defined(OS_NACL)

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
@@ -913,6 +913,16 @@ const FeatureEntry::FeatureVariation kDataReductionMainMenuFeatureVariations[] =
       arraysize(kPersistentMenuItemEnabled), nullptr}};
 #endif  // OS_ANDROID
 
+const FeatureEntry::Choice kEnableHeapProfilingChoices[] = {
+    {flags_ui::kGenericExperimentChoiceDisabled, "", ""},
+    {flag_descriptions::kEnableHeapProfilingModePseudo,
+     switches::kEnableHeapProfiling, switches::kEnableHeapProfilingModePseudo},
+    {flag_descriptions::kEnableHeapProfilingModeNative,
+     switches::kEnableHeapProfiling, switches::kEnableHeapProfilingModeNative},
+    {flag_descriptions::kEnableHeapProfilingTaskProfiler,
+     switches::kEnableHeapProfiling,
+     switches::kEnableHeapProfilingTaskProfiler}};
+
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the entry is the internal name.
@@ -2759,6 +2769,10 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kAutoplayPolicyDescription, kOsAll,
      MULTI_VALUE_TYPE(kAutoplayPolicyChoices)},
 
+    {"enable-heap-profiling", flag_descriptions::kEnableHeapProfilingName,
+     flag_descriptions::kEnableHeapProfilingDescription, kOsAll,
+     MULTI_VALUE_TYPE(kEnableHeapProfilingChoices)},
+
     // NOTE: Adding new command-line switches requires adding corresponding
     // entries to enum "LoginCustomFlags" in histograms.xml. See note in
     // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
@@ -3058,4 +3058,14 @@ const char kOmniboxDisplayTitleForCurrentUrlDescription[] =
     "the current page is provided as the first suggestion without a title. "
     "Enabling this flag causes the title to be displayed.";
 
+const char kEnableHeapProfilingName[] = "Heap profiling";
+
+const char kEnableHeapProfilingDescription[] = "Enables heap profiling.";
+
+const char kEnableHeapProfilingModePseudo[] = "Enabled (pseudo mode)";
+
+const char kEnableHeapProfilingModeNative[] = "Enabled (native mode)";
+
+const char kEnableHeapProfilingTaskProfiler[] = "Enabled (task mode)";
+
 }  // namespace flag_descriptions
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
@@ -3323,6 +3323,15 @@ extern const char kOmniboxDisplayTitleForCurrentUrlName[];
 // for current URL.
 extern const char kOmniboxDisplayTitleForCurrentUrlDescription[];
 
+// Name & description for the heap profiling flag.
+extern const char kEnableHeapProfilingName[];
+extern const char kEnableHeapProfilingDescription[];
+
+// Descriptions of the different heap profiling modes.
+extern const char kEnableHeapProfilingModePseudo[];
+extern const char kEnableHeapProfilingModeNative[];
+extern const char kEnableHeapProfilingTaskProfiler[];
+
 }  // namespace flag_descriptions
 
 #endif  // CHROME_BROWSER_FLAG_DESCRIPTIONS_H_
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
@@ -103655,6 +103655,7 @@ from previous Chrome versions.
   <int value="-891856063" label="MidiManagerAndroid:enabled"/>
   <int value="-885601782" label="enable-contextual-search"/>
   <int value="-884864731" label="WebPaymentsSingleAppUiSkip:enabled"/>
+  <int value="-881854123" label="enable-heap-profiling"/>
   <int value="-881054479" label="WebAssemblyStreaming:disabled"/>
   <int value="-876148583" label="ArcBootCompletedBroadcast:disabled"/>
   <int value="-867087281" label="enable-virtual-keyboard"/>