Add configurable limit to allocations in heap profiler.

base/trace_event/trace_config.h

 // Copyright 2015 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.
 
 #ifndef BASE_TRACE_EVENT_TRACE_CONFIG_H_
 #define BASE_TRACE_EVENT_TRACE_CONFIG_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 22 matching lines @@
   RECORD_AS_MUCH_AS_POSSIBLE,
 
   // Echo to console. Events are discarded.
   ECHO_TO_CONSOLE,
 };
 
 class BASE_EXPORT TraceConfig {
  public:
   typedef std::vector<std::string> StringList;
 
-  // Specifies the memory dump config for tracing. Used only when
-  // "memory-infra" category is enabled.
+  // Specifies the triggers in the memory dump config.
   struct MemoryDumpTriggerConfig {

[Primiano Tucci (use gerrit), 2016/04/22 14:18:29]

I think just for the sake of legibility these structs (this and
HeapProfilerOptions) be inner structs of MemoryDumpConfig, so it's clear they
all belong to the same thing.

[Maria, 2016/04/25 18:37:24]

Done.

     uint32_t periodic_interval_ms;
     MemoryDumpLevelOfDetail level_of_detail;
   };
 
-  typedef std::vector<MemoryDumpTriggerConfig> MemoryDumpConfig;
+  // Specifies the configuration options for the heap profiler.
+  struct HeapProfilerOptions {
+    // Default value for |breakdown_threshold_bytes|.
+    enum { kDefaultBreakdownThresholdBytes = 1024 };
+
+    HeapProfilerOptions();
+    ~HeapProfilerOptions();
+
+    // Reset the options to default.
+    void Clear();
+
+    uint32_t breakdown_threshold_bytes;
+  };
+
+  // Specifies the memory dump config for tracing.
+  // Used only when "memory-infra" category is enabled.
+  struct MemoryDumpConfig {
+    MemoryDumpConfig();
+    MemoryDumpConfig(const MemoryDumpConfig& other);
+    ~MemoryDumpConfig();
+
+    // Reset the values in the config.
+    void Clear();
+
+    std::vector<MemoryDumpTriggerConfig> triggers;
+    HeapProfilerOptions heap_profiler_options;
+  };
 
   TraceConfig();
 
   // Create TraceConfig object from category filter and trace options strings.
   //
   // |category_filter_string| is a comma-delimited list of category wildcards.
   // A category can have an optional '-' prefix to make it an excluded category.
   // All the same rules apply above, so for example, having both included and
   // excluded categories in the same list would not be supported.
   //
@@ skipping 144 matching lines @@
                              const std::string& trace_options_string);
 
   void SetCategoriesFromIncludedList(const base::ListValue& included_list);
   void SetCategoriesFromExcludedList(const base::ListValue& excluded_list);
   void SetSyntheticDelaysFromList(const base::ListValue& list);
   void AddCategoryToDict(base::DictionaryValue& dict,
                          const char* param,
                          const StringList& categories) const;
 
   void SetMemoryDumpConfig(const base::DictionaryValue& memory_dump_config);
+  void SetTriggers(const base::DictionaryValue& memory_dump_config);

[Primiano Tucci (use gerrit), 2016/04/22 14:18:29]

why do we have these intermediate setters (SetTriggers and
SetHeapProfilerOptions)?
Can we have just the SetMemoryDUmpConfig?

[Maria, 2016/04/25 18:37:24]

I found it more clean to do it this way rather than nest the code inside checks,
but I don't care too much. Combined the methods.

+  void SetHeapProfilerOptions(const base::DictionaryValue& memory_dump_config);
   void SetDefaultMemoryDumpConfig();
 
   // Convert TraceConfig to the dict representation of the TraceConfig.
   void ToDict(base::DictionaryValue& dict) const;
 
   std::string ToTraceOptionsString() const;
 
   void WriteCategoryFilterString(const StringList& values,
                                  std::string* out,
                                  bool included) const;
@@ skipping 18 matching lines @@
   StringList included_categories_;
   StringList disabled_categories_;
   StringList excluded_categories_;
   StringList synthetic_delays_;
 };
 
 }  // namespace trace_event
 }  // namespace base
 
 #endif  // BASE_TRACE_EVENT_TRACE_CONFIG_H_