Index: base/trace_event/trace_config_memory_test_util.h |
diff --git a/base/trace_event/trace_config_memory_test_util.h b/base/trace_event/trace_config_memory_test_util.h |
index 0ecdb3c15ca5c5b9c02bd62a97a84f279ab39d0f..754651d1d6c225f225b1f3ab57e93df1d812fdbd 100644 |
--- a/base/trace_event/trace_config_memory_test_util.h |
+++ b/base/trace_event/trace_config_memory_test_util.h |
@@ -13,8 +13,8 @@ namespace trace_event { |
class TraceConfigMemoryTestUtil { |
public: |
- static std::string GetTraceConfig_PeriodicTriggers(int light_period, |
- int heavy_period) { |
+ static std::string GetTraceConfig_LegacyPeriodicTriggers(int light_period, |
+ int heavy_period) { |
return StringPrintf( |
"{" |
"\"enable_argument_filter\":false," |
@@ -42,6 +42,37 @@ class TraceConfigMemoryTestUtil { |
"}", MemoryDumpManager::kTraceCategory, light_period, heavy_period); |
} |
+ static std::string GetTraceConfig_PeriodicTriggers(int light_period, |
+ int heavy_period) { |
+ return StringPrintf( |
+ "{" |
+ "\"enable_argument_filter\":false," |
+ "\"enable_systrace\":false," |
+ "\"included_categories\":[" |
+ "\"%s\"" |
+ "]," |
+ "\"memory_dump_config\":{" |
+ "\"allowed_dump_modes\":[\"background\",\"light\",\"detailed\"]," |
+ "\"heap_profiler_options\":{" |
+ "\"breakdown_threshold_bytes\":2048" |
+ "}," |
+ "\"triggers\":[" |
+ "{" |
+ "\"min_time_between_dumps_ms\":%d," |
+ "\"mode\":\"light\"," |
+ "\"type\":\"periodic_interval\"" |
+ "}," |
+ "{" |
+ "\"min_time_between_dumps_ms\":%d," |
+ "\"mode\":\"detailed\"," |
+ "\"type\":\"periodic_interval\"" |
+ "}" |
+ "]" |
+ "}," |
+ "\"record_mode\":\"record-until-full\"" |
+ "}", MemoryDumpManager::kTraceCategory, light_period, heavy_period); |
+ } |
+ |
static std::string GetTraceConfig_EmptyTriggers() { |
return StringPrintf( |
"{" |
@@ -83,14 +114,37 @@ class TraceConfigMemoryTestUtil { |
"\"allowed_dump_modes\":[\"background\"]," |
"\"triggers\":[" |
"{" |
+ "\"min_time_between_dumps_ms\":%d," |
"\"mode\":\"background\"," |
- "\"periodic_interval_ms\":%d" |
+ "\"type\":\"periodic_interval\"" |
"}" |
"]" |
"}," |
"\"record_mode\":\"record-until-full\"" |
"}", MemoryDumpManager::kTraceCategory, period_ms); |
} |
+ |
+ static std::string GetTraceConfig_PeakDetectionTrigger(int heavy_period) { |
+ return StringPrintf( |
+ "{" |
+ "\"enable_argument_filter\":false," |
+ "\"enable_systrace\":false," |
+ "\"included_categories\":[" |
+ "\"%s\"" |
+ "]," |
+ "\"memory_dump_config\":{" |
+ "\"allowed_dump_modes\":[\"background\",\"light\",\"detailed\"]," |
+ "\"triggers\":[" |
+ "{" |
+ "\"min_time_between_dumps_ms\":%d," |
+ "\"mode\":\"detailed\"," |
+ "\"type\":\"peak_memory_usage\"" |
+ "}" |
+ "]" |
+ "}," |
+ "\"record_mode\":\"record-until-full\"" |
+ "}", MemoryDumpManager::kTraceCategory, heavy_period); |
+ } |
}; |
} // namespace trace_event |