diff --git a/src/Perfolizer/Perfolizer/Helpers/CpuBrandHelper.cs b/src/Perfolizer/Perfolizer/Helpers/CpuBrandHelper.cs index 28fb867..5a77ec5 100644 --- a/src/Perfolizer/Perfolizer/Helpers/CpuBrandHelper.cs +++ b/src/Perfolizer/Perfolizer/Helpers/CpuBrandHelper.cs @@ -67,7 +67,7 @@ public static string ToShortBrandName(this PhdCpu? cpu, bool includeMaxFrequency if (cpu.PhysicalCoreCount.HasValue && cpu.PhysicalCoreCount.Value > 0) processorName = Regex.Replace(processorName, @"(\w+?-Core Processor)", "").Trim(); - string? frequencyString = GetBrandStyledActualFrequency(cpu.GetNominalFrequency()); + string? frequencyString = GetBrandStyledActualFrequency(cpu.NominalFrequency()); if (includeMaxFrequency && frequencyString != null && !processorName.Contains(frequencyString)) { // show Max only if there's already a frequency name to differentiate the two diff --git a/src/Perfolizer/Perfolizer/Phd/Base/IPhdDisplay.cs b/src/Perfolizer/Perfolizer/Phd/Base/IPhdDisplay.cs deleted file mode 100644 index 45de03a..0000000 --- a/src/Perfolizer/Perfolizer/Phd/Base/IPhdDisplay.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Perfolizer.Phd.Base; - -public interface IPhdDisplay -{ - string Display { get; set; } -} \ No newline at end of file diff --git a/src/Perfolizer/Perfolizer/Phd/Base/PhdEntry.cs b/src/Perfolizer/Perfolizer/Phd/Base/PhdEntry.cs index 5946df1..c3b673e 100644 --- a/src/Perfolizer/Perfolizer/Phd/Base/PhdEntry.cs +++ b/src/Perfolizer/Perfolizer/Phd/Base/PhdEntry.cs @@ -6,8 +6,6 @@ namespace Perfolizer.Phd.Base; public class PhdEntry : PhdObject { - private PhdEntry? parent; - /// /// Service information (like the structure of the reports) /// @@ -57,19 +55,6 @@ public class PhdEntry : PhdObject public double? Value { get; set; } public MeasurementUnit Unit { get; set; } = NumberUnit.Instance; - // TODO: Support - public int? IterationIndex { get; set; } - - public long? InvocationCount { get; set; } - // public DateTimeOffset? StartTimestamp { get; set; } - // public DateTimeOffset? EndTimestamp { get; set; } - // public string? Marker { get; set; } - // - // /// - // /// Examples: mean, median, min, max, p0, p25, p75, p100 - // /// - // public string? Aggregator { get; set; } - private readonly List children = []; public IReadOnlyList Children => children; @@ -84,23 +69,10 @@ public class PhdEntry : PhdObject public PhdEntry Add(params PhdEntry[] entries) { foreach (var entry in entries) - { children.Add(entry); - entry.parent = this; - } return this; } - public bool Remove(PhdEntry entry) - { - if (entry.parent == this && children.Remove(entry)) - { - entry.parent = null; - return true; - } - return false; - } - public IEnumerable Traverse() { yield return this; diff --git a/src/Perfolizer/Perfolizer/Phd/Dto/PhdCpu.cs b/src/Perfolizer/Perfolizer/Phd/Dto/PhdCpu.cs index 4977654..ce2c4b6 100644 --- a/src/Perfolizer/Perfolizer/Phd/Dto/PhdCpu.cs +++ b/src/Perfolizer/Perfolizer/Phd/Dto/PhdCpu.cs @@ -14,12 +14,10 @@ public class PhdCpu : PhdObject public int? LogicalCoreCount { get; set; } public string? Architecture { get; set; } public long? NominalFrequencyHz { get; set; } - public long? MinFrequencyHz { get; set; } public long? MaxFrequencyHz { get; set; } - public Frequency? GetNominalFrequency() => NominalFrequencyHz.HasValue ? Frequency.FromHz(NominalFrequencyHz.Value) : null; - public Frequency? GetMinFrequency() => MinFrequencyHz.HasValue ? Frequency.FromHz(MinFrequencyHz.Value) : null; - public Frequency? GetMaxFrequency() => MaxFrequencyHz.HasValue ? Frequency.FromHz(MaxFrequencyHz.Value) : null; + public Frequency? NominalFrequency() => NominalFrequencyHz.HasValue ? Frequency.FromHz(NominalFrequencyHz.Value) : null; + public Frequency? MaxFrequency() => MaxFrequencyHz.HasValue ? Frequency.FromHz(MaxFrequencyHz.Value) : null; public PhdCpu SetDisplay() { diff --git a/src/Perfolizer/Perfolizer/Phd/TODO.md b/src/Perfolizer/Perfolizer/Phd/TODO.md index fd7ea82..8864feb 100644 --- a/src/Perfolizer/Perfolizer/Phd/TODO.md +++ b/src/Perfolizer/Perfolizer/Phd/TODO.md @@ -4,4 +4,5 @@ * Analysers * Import old jobs * GC -* Unit: RPS \ No newline at end of file +* Unit: RPS +* Rename: Children -> Nested \ No newline at end of file