tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index b42135ab4be8d99939fdea5df70e578b95f3b3bb..fb4bb381f3581a02aa0a65a463904a344335b48a 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -69829,6 +69829,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="UMA.PersistentAllocator.BrowserMetrics.Errors"

[Alexei Svitkine (slow), 2017/01/17 20:09:27]

Can these definitions be re-organized using <histogram-suffixes>? Otherwise
there's a lot of duplication.

[bcwhite, 2017/01/17 20:28:49]

Good idea.  Let me see if I can make that work.

[bcwhite, 2017/01/17 20:45:03]

I don't see how.  I can't create the individual suffixes from a base name
because there is no "units=" option for the individual suffixes and all three
are different.

The "ordering=prefix" looks like the right option to create three base
histograms and insert the many allocator names... but that option only inserts
after the _first_ dot and I need it to insert after the second dot
("UMA.PersistentAllocator.NAME.whatever").

Is there another way?

+    enum="PersistentAllocatorErrors">
+  <owner>bcwhite@chromium.org</owner>
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Errors detected by the persistent memory for metrics in the browser process.
+    These are set when they occur.
+  </summary>
+</histogram>
+
 <histogram name="UMA.PersistentAllocator.BrowserMetrics.UsedPct" units="%">
   <owner>bcwhite@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -69849,6 +69859,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="UMA.PersistentAllocator.FieldTrialAllocator.Errors"
+    enum="PersistentAllocatorErrors">
+  <owner>bcwhite@chromium.org</owner>
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Errors detected by the persistent memory used for field trials. These are
+    set when they occur.
+  </summary>
+</histogram>
+
 <histogram name="UMA.PersistentAllocator.FieldTrialAllocator.UsedPct" units="%">
   <owner>lawrencewu@chromium.org</owner>
   <owner>bcwhite@chromium.org</owner>
@@ -69868,6 +69888,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="UMA.PersistentAllocator.GpuMetrics.Errors"
+    enum="PersistentAllocatorErrors">
+  <owner>bcwhite@chromium.org</owner>
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Errors detected by the persistent memory for metrics in a GPU process. These
+    are set when they occur.
+  </summary>
+</histogram>
+
 <histogram name="UMA.PersistentAllocator.GpuMetrics.UsedPct" units="%">
   <owner>bcwhite@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -69887,6 +69917,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="UMA.PersistentAllocator.PpapiBrokerMetrics.Errors"
+    enum="PersistentAllocatorErrors">
+  <owner>bcwhite@chromium.org</owner>
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Errors detected by the persistent memory for metrics in a &quot;PPAPI
+    broker&quot; process. These are set when they occur.
+  </summary>
+</histogram>
+
 <histogram name="UMA.PersistentAllocator.PpapiBrokerMetrics.UsedPct" units="%">
   <owner>bcwhite@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -69906,6 +69946,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="UMA.PersistentAllocator.PpapiPluginMetrics.Errors"
+    enum="PersistentAllocatorErrors">
+  <owner>bcwhite@chromium.org</owner>
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Errors detected by the persistent memory for metrics in a &quot;PPAPI
+    plugin&quot; process. These are set when they occur.
+  </summary>
+</histogram>
+
 <histogram name="UMA.PersistentAllocator.PpapiPluginMetrics.UsedPct" units="%">
   <owner>bcwhite@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -69924,6 +69974,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="UMA.PersistentAllocator.RendererMetrics.Errors"
+    enum="PersistentAllocatorErrors">
+  <owner>bcwhite@chromium.org</owner>
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Errors detected by the persistent memory for metrics in a renderer process.
+    These are set when they occur.
+  </summary>
+</histogram>
+
 <histogram name="UMA.PersistentAllocator.RendererMetrics.UsedPct" units="%">
   <owner>bcwhite@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -69943,6 +70003,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="UMA.PersistentAllocator.SandboxHelperMetrics.Errors"
+    enum="PersistentAllocatorErrors">
+  <owner>bcwhite@chromium.org</owner>
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Errors detected by the persistent memory for metrics in a &quot;sandbox
+    helper&quot; process. These are set when they occur.
+  </summary>
+</histogram>
+
 <histogram name="UMA.PersistentAllocator.SandboxHelperMetrics.UsedPct"
     units="%">
   <owner>bcwhite@chromium.org</owner>
@@ -69962,6 +70032,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="UMA.PersistentAllocator.SetupMetrics.Errors"
+    enum="PersistentAllocatorErrors">
+  <owner>bcwhite@chromium.org</owner>
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Errors detected by the persistent memory for metrics in a setup process.
+    These are set when they occur.
+  </summary>
+</histogram>
+
 <histogram name="UMA.PersistentAllocator.SetupMetrics.UsedPct" units="%">
   <owner>bcwhite@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -69980,6 +70060,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="UMA.PersistentAllocator.UtilityMetrics.Errors"
+    enum="PersistentAllocatorErrors">
+  <owner>bcwhite@chromium.org</owner>
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Errors detected by the persistent memory for metrics in a
+    &quot;utility&quot; process. These are set when they occur.
+  </summary>
+</histogram>
+
 <histogram name="UMA.PersistentAllocator.UtilityMetrics.UsedPct" units="%">
   <owner>bcwhite@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -69998,6 +70088,16 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="UMA.PersistentAllocator.ZygoteMetrics.Errors"
+    enum="PersistentAllocatorErrors">
+  <owner>bcwhite@chromium.org</owner>
+  <owner>asvitkine@chromium.org</owner>
+  <summary>
+    Errors detected by the persistent memory for metrics in a &quot;zygote&quot;
+    process. These are set when they occur.
+  </summary>
+</histogram>
+
 <histogram name="UMA.PersistentAllocator.ZygoteMetrics.UsedPct" units="%">
   <owner>bcwhite@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -100064,6 +100164,10 @@ value.
   <int value="9" label="DEPRECATED_XML_PROTO_MISMATCH"/>
 </enum>
 
+<enum name="PersistentAllocatorErrors" type="int">
+  <int value="1" label="Allocator memory is corrupt (set only once)"/>
+</enum>
+
 <enum name="PersistentHistogramsInitResult" type="int">
   <int value="0" label="Local-Memory Success"/>
   <int value="1" label="Local-Memory Failure"/>