ensure the order of Metrics columns

dotnet · Aug 4, 2021 · 51d39f0 · 51d39f0
1 parent 2925b4b
commit 51d39f0
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 1 deletion.
diff --git a/src/BenchmarkDotNet/Columns/MetricColumn.cs b/src/BenchmarkDotNet/Columns/MetricColumn.cs
@@ -16,7 +16,7 @@ public class MetricColumn : IColumn
         public string Legend => descriptor.Legend;
         public bool AlwaysShow => true;
         public ColumnCategory Category => ColumnCategory.Metric;
-        public int PriorityInCategory => 0;
+        public int PriorityInCategory => descriptor.PriorityInCategory;
         public bool IsNumeric => true;
         public UnitType UnitType => descriptor.UnitType;
 

diff --git a/src/BenchmarkDotNet/Diagnosers/AllocatedNativeMemoryDescriptor.cs b/src/BenchmarkDotNet/Diagnosers/AllocatedNativeMemoryDescriptor.cs
@@ -12,6 +12,7 @@ internal class AllocatedNativeMemoryDescriptor : IMetricDescriptor
         public UnitType UnitType => UnitType.Size;
         public string Unit => SizeUnit.B.Name;
         public bool TheGreaterTheBetter => false;
+        public int PriorityInCategory => 0;
     }
 
     internal class NativeMemoryLeakDescriptor : IMetricDescriptor
@@ -23,5 +24,6 @@ internal class NativeMemoryLeakDescriptor : IMetricDescriptor
         public UnitType UnitType => UnitType.Size;
         public string Unit => SizeUnit.B.Name;
         public bool TheGreaterTheBetter => false;
+        public int PriorityInCategory => 0;
     }
 }
diff --git a/src/BenchmarkDotNet/Diagnosers/MemoryDiagnoser.cs b/src/BenchmarkDotNet/Diagnosers/MemoryDiagnoser.cs
@@ -56,6 +56,7 @@ private class AllocatedMemoryMetricDescriptor : IMetricDescriptor
             public UnitType UnitType => UnitType.Size;
             public string Unit => SizeUnit.B.Name;
             public bool TheGreaterTheBetter => false;
+            public int PriorityInCategory => GC.MaxGeneration + 1;
         }
 
         private class GarbageCollectionsMetricDescriptor : IMetricDescriptor
@@ -69,6 +70,7 @@ private GarbageCollectionsMetricDescriptor(int generationId)
                 Id = $"Gen{generationId}Collects";
                 DisplayName = $"Gen {generationId}";
                 Legend = $"GC Generation {generationId} collects per 1000 operations";
+                PriorityInCategory = generationId;
             }
 
             public string Id { get; }
@@ -78,6 +80,7 @@ private GarbageCollectionsMetricDescriptor(int generationId)
             public UnitType UnitType => UnitType.Dimensionless;
             public string Unit => "Count";
             public bool TheGreaterTheBetter => false;
+            public int PriorityInCategory { get; }
         }
     }
 }
diff --git a/src/BenchmarkDotNet/Diagnosers/PmcMetricDescriptor.cs b/src/BenchmarkDotNet/Diagnosers/PmcMetricDescriptor.cs
@@ -20,5 +20,6 @@ internal PmcMetricDescriptor(PreciseMachineCounter counter)
         public string NumberFormat => "N0";
         public UnitType UnitType => UnitType.Dimensionless;
         public string Unit => "Count";
+        public int PriorityInCategory => 0;
     }
 }
diff --git a/src/BenchmarkDotNet/Diagnosers/ThreadingDiagnoser.cs b/src/BenchmarkDotNet/Diagnosers/ThreadingDiagnoser.cs
@@ -61,6 +61,7 @@ private class CompletedWorkItemCountMetricDescriptor : IMetricDescriptor
             public UnitType UnitType => UnitType.Dimensionless;
             public string Unit => "Count";
             public bool TheGreaterTheBetter => false;
+            public int PriorityInCategory => 0;
         }
 
         private class LockContentionCountMetricDescriptor : IMetricDescriptor
@@ -74,6 +75,7 @@ private class LockContentionCountMetricDescriptor : IMetricDescriptor
             public UnitType UnitType => UnitType.Dimensionless;
             public string Unit => "Count";
             public bool TheGreaterTheBetter => false;
+            public int PriorityInCategory => 0;
         }
     }
 }
diff --git a/src/BenchmarkDotNet/Disassemblers/DisassemblyDiagnoser.cs b/src/BenchmarkDotNet/Disassemblers/DisassemblyDiagnoser.cs
@@ -169,6 +169,7 @@ private class NativeCodeSizeMetricDescriptor : IMetricDescriptor
             public UnitType UnitType => UnitType.Size;
             public string Unit => SizeUnit.B.Name;
             public bool TheGreaterTheBetter => false;
+            public int PriorityInCategory => 0;
         }
     }
 }
diff --git a/src/BenchmarkDotNet/Reports/Metric.cs b/src/BenchmarkDotNet/Reports/Metric.cs
@@ -32,6 +32,8 @@ public interface IMetricDescriptor
         [PublicAPI] string Unit { get; }
 
         [PublicAPI] bool TheGreaterTheBetter { get; }
+
+        [PublicAPI] int PriorityInCategory { get; }
     }
 
     public class MetricDescriptorEqualityComparer : EqualityComparer<IMetricDescriptor>