Show memory in megabytes

Profiler/Profiler.Format.ps1xml

@@ -11,16 +11,20 @@
           <ListEntry>
             <ListItems>
               <ListItem>
-                <Label>Top50Duration</Label>
-                <ScriptBlock>'List top 50 lines based on duration'</ScriptBlock>
+                <Label>Top50SelfDuration</Label>
+                <ScriptBlock>'List top 50 lines based on time consumed directly by the line'</ScriptBlock>
+              </ListItem>
+              <ListItem>
+                <Label>Top50SelfMemory</Label>
+                <ScriptBlock>'List top 50 lines based on the memory consumed directly by the line'</ScriptBlock>
               </ListItem>
               <ListItem>
                 <Label>Top50HitCount</Label>
                 <ScriptBlock>'List top 50 lines based on hit count'</ScriptBlock>
               </ListItem>
               <ListItem>
-                <Label>Top50SelfDuration</Label>
-                <ScriptBlock>'List top 50 lines based on time consumed directly by the line'</ScriptBlock>
+                <Label>Top50Duration</Label>
+                <ScriptBlock>'List top 50 lines based on duration'</ScriptBlock>
               </ListItem>
               <ListItem>
                 <Label>Top50FunctionDuration</Label>
@@ -38,10 +42,6 @@
                 <Label>Top50Memory</Label>
                 <ScriptBlock>'List top 50 lines based on the memory consumed'</ScriptBlock>
               </ListItem>
-              <ListItem>
-                <Label>Top50SelfMemory</Label>
-                <ScriptBlock>'List top 50 lines based on the memory consumed directly by the line'</ScriptBlock>
-              </ListItem>
               <ListItem>
                 <Label>AllLines</Label>
                 <ScriptBlock>'Show all lines processed by profiler trace'</ScriptBlock>
@@ -56,6 +56,9 @@
               <ListItem>
                 <PropertyName>StopwatchDuration</PropertyName>
               </ListItem>
+              <ListItem>
+                <PropertyName>ScriptBlock</PropertyName>
+              </ListItem>
             </ListItems>
           </ListEntry>
         </ListEntries>

Profiler/Profiler.psd1

@@ -8,7 +8,7 @@
 RootModule = 'Profiler.psm1'
 
 # Version number of this module.
-ModuleVersion = '4.2.0'
+ModuleVersion = '4.3.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -26,10 +26,10 @@ CompanyName = 'nohwnd'
 Copyright = '(c) nohwnd. All rights reserved.'
 
 # Description of the functionality provided by this module
-Description = 'Script, ScriptBlock and module performance profiler for PowerShell 5, and PowerShell 7.'
+Description = 'Script, ScriptBlock and module performance profiler for PowerShell 5.1, and PowerShell 7.'
 
 # Minimum version of the PowerShell engine required by this module
-PowerShellVersion = '5.0.0'
+PowerShellVersion = '5.1.0'
 
 # Name of the PowerShell host required by this module
 # PowerShellHostName = ''

Profiler/Trace-Script.ps1

@@ -143,7 +143,7 @@ function Trace-Script {
     $trace = $result.Trace
 
     $scriptBlocks = $out.ScriptBlocks
-    $traceCount = $trace.Count
+    $traceCount = $trace.Count-4 # 2 first and 2 last events are internal events of Profiler
 
     Write-Host -ForegroundColor Magenta "Processing $($traceCount) trace events. $(if (1000000 -lt $traceCount) { "This might take a while..."})"
 
@@ -174,6 +174,8 @@ function Trace-Script {
         $line.SelfPercent = [Math]::Round($line.SelfDuration.Ticks / $ticks, 5, [System.MidpointRounding]::AwayFromZero) * 100
         $line.MemoryPercent = if (0 -ne $totalMem) { [Math]::Round($line.Memory / $totalMem, 5, [System.MidpointRounding]::AwayFromZero) * 100 } else { 100 } 
         $line.SelfMemoryPercent = if (0 -ne $totalMem) { [Math]::Round($line.SelfMemory / $totalMem, 5, [System.MidpointRounding]::AwayFromZero) * 100 } else { 100 }
+        $line.Memory = [Math]::Round($line.Memory, 5, [System.MidpointRounding]::AwayFromZero)
+        $line.SelfMemory = [Math]::Round($line.SelfMemory, 5, [System.MidpointRounding]::AwayFromZero)
         $line
     }
     Write-TimeAndRestart $sw
@@ -266,6 +268,7 @@ function Trace-Script {
     # this way we can get the partial object out for 
     # debugging when this fails on someones system
     $script:processedTrace = [Profiler.Trace]::new()
+    $script:processedTrace.ScriptBlock = $ScriptBlock
     $script:processedTrace.TotalDuration = $total
     $script:processedTrace.StopwatchDuration = $out.Stopwatch
     $script:processedTrace.Events = $trace

Profiler/Trace-ScriptInternal.ps1

@@ -64,7 +64,8 @@ function Trace-ScriptInternal {
 
     $out.Stopwatch = $result.Stopwatch
     $out.ScriptBlocks = $result.ScriptBlocks
-    Write-Host -Foreground Magenta "Tracing done. Got $($trace.Count) trace events."
+    $traceCount = $result.Trace.Count - 4 # 2 first and 2 last events are internal events of Profiler
+    Write-Host -Foreground Magenta "Tracing done. Got $($traceCount) trace events."
     $result
 }
 

csharp/Profiler/CommandHit.cs

@@ -10,17 +10,17 @@ public class CommandHit
     /// <summary>
     /// Line number of the command in the file or ScriptBlock.
     /// </summary>
-    public uint Line { get; set; }
+    public int Line { get; set; }
 
     /// <summary>
     /// Column of the command in the file or ScriptBlock.
     /// </summary>
-    public uint Column { get; set; }
+    public int Column { get; set; }
 
     /// <summary>
     /// Number of hits on command.
     /// </summary>
-    public uint HitCount { get; set; } = 1;
+    public int HitCount { get; set; } = 1;
 
     /// <summary>
     /// Time used exclusively by this command
@@ -34,8 +34,8 @@ public class CommandHit
 
     public CommandHit(Hit hit)
     {
-        Line         = (uint)hit.Line;
-        Column       = (uint)hit.Column;
+        Line         = (int)hit.Line;
+        Column       = (int)hit.Column;
         SelfDuration = hit.SelfDuration;
         Text         = hit.Text;
     }

csharp/Profiler/Hit.cs

@@ -85,22 +85,23 @@ public struct Hit
 
     public bool Folded;
 
-    // HeapSize at the start of the hit.
-    public long HeapSize;
+    // HeapSize at the start of the hit in MB.
+    public decimal HeapSize;
 
-    // WorkingSet at the start of the hit.
-    public long WorkingSet;
+    // WorkingSet at the start of the hit in MB.
+    public decimal WorkingSet;
 
-    // HeapSize heapSize consumed by the hit (endHeapSize - startHeapSize).
-    public long SelfHeapSize;
+    // HeapSize heapSize consumed by the hit (endHeapSize - startHeapSize) in MB.
+    public decimal SelfHeapSize;
 
-    // Working set consumed by the hit.
-    public long SelfWorkingSet;
+    // Working set consumed by the hit in MB.
+    public decimal SelfWorkingSet;
 
-    // Working set consumed by the hit.
-    public long AllocatedBytes;
+    // Working set consumed by the hit in MB.
+    public decimal AllocatedBytes;
 
-    public long SelfAllocatedBytes;
+    // Bytes allocated by this hit in MB.
+    public decimal SelfAllocatedBytes;
 
     public int Gc0;
     public int SelfGc0;
@@ -112,6 +113,6 @@ public struct Hit
     public int SelfGc2;
 
 
-    public long TotalBytes;
+    public decimal TotalBytes;
     public int  TotalGc;
 }

csharp/Profiler/LineProfile.cs

@@ -11,7 +11,7 @@ public class LineProfile
     /// <summary>
     /// Percent of total duration used by line including all the code it calls.
     /// </summary>
-    public double Percent { get; set; } = 0.00;
+    public decimal Percent { get; set; } = 0;
 
     /// <summary>
     /// Time used by line including subcalls.
@@ -22,7 +22,7 @@ public class LineProfile
     /// <summary>
     /// Percent of total duration used by line, excluding the code it calls.
     /// </summary>
-    public double SelfPercent { get; set; } = 0.00;
+    public decimal SelfPercent { get; set; } = 0;
 
     /// <summary>
     /// Time used exclusively by this line.
@@ -33,22 +33,22 @@ public class LineProfile
     /// <summary>
     /// Percent of total memory used by line including all the code it calls.
     /// </summary>
-    public double MemoryPercent { get; set; } = 0.00;
+    public decimal MemoryPercent { get; set; } = 0;
 
     /// <summary>
     /// Memory consumed by line and all subcalls.
     /// </summary>
-    public long Memory { get; set; }
+    public decimal Memory { get; set; }
 
     /// <summary>
     /// Percent of total memory used by line, excluding the code it calls.
     /// </summary>
-    public double SelfMemoryPercent { get; set; } = 0.00;
+    public decimal SelfMemoryPercent { get; set; } = 0;
 
     /// <summary>
     /// Memory consumed exclusively by this line.
     /// </summary>
-    public long SelfMemory { get; set; }
+    public decimal SelfMemory { get; set; }
 
     /// <summary>
     /// Garbage collections happening on this line and in all subcalls (all generations).
@@ -64,7 +64,7 @@ public class LineProfile
     /// <summary>
     /// Number of hits on line.
     /// </summary>
-    public uint HitCount { get; set; } = 0;
+    public int HitCount { get; set; } = 0;
 
     /// <summary>
     /// Name of file or id of ScriptBlock the line belongs to.
@@ -74,7 +74,7 @@ public class LineProfile
     /// <summary>
     /// Line number in the file or ScriptBlock.
     /// </summary>
-    public uint? Line { get; set; }
+    public int? Line { get; set; }
 
     /// <summary>
     /// Function that called this line.
@@ -104,5 +104,5 @@ public class LineProfile
     /// <summary>
     /// All command hits in this line using column as key.
     /// </summary>
-    public IDictionary<uint, CommandHit> CommandHits { get; set; } = new Dictionary<uint, CommandHit>();
+    public IDictionary<int, CommandHit> CommandHits { get; set; } = new Dictionary<int, CommandHit>();
 }

csharp/Profiler/LineProfileView.cs

@@ -24,7 +24,7 @@ public LineProfileView(LineProfile line)
     /// <summary>
     /// Percent of total duration used by line including all the code it calls.
     /// </summary>
-    public double Percent => _line.Percent;
+    public decimal Percent => _line.Percent;
 
     /// <summary>
     /// Time used by line including subcalls.
@@ -35,7 +35,7 @@ public LineProfileView(LineProfile line)
     /// <summary>
     /// Percent of total duration used by line, excluding the code it calls.
     /// </summary>
-    public double SelfPercent => _line.SelfPercent;
+    public decimal SelfPercent => _line.SelfPercent;
 
     /// <summary>
     /// Time used exclusively by this line.
@@ -45,22 +45,22 @@ public LineProfileView(LineProfile line)
     /// <summary>
     /// Percent of total memory used by line including all the code it calls.
     /// </summary>
-    public double MemoryPercent => _line.MemoryPercent;
+    public decimal MemoryPercent => _line.MemoryPercent;
 
     /// <summary>
     /// Memory used by this line.
     /// </summary>
-    public long Memory => _line.Memory;
+    public decimal Memory => _line.Memory;
 
     /// <summary>
     /// Percent of total memory used by line.
     /// </summary>
-    public double SelfMemoryPercent => _line.SelfMemoryPercent;
+    public decimal SelfMemoryPercent => _line.SelfMemoryPercent;
 
     /// <summary>
     /// Memory used exclusively by this line.
     /// </summary>
-    public long SelfMemory => _line.SelfMemory;
+    public decimal SelfMemory => _line.SelfMemory;
 
     /// <summary>
     /// Garbage collection count that happened on this line.
@@ -77,7 +77,7 @@ public LineProfileView(LineProfile line)
     /// <summary>
     /// Number of hits on line.
     /// </summary>
-    public uint HitCount => _line.HitCount;
+    public int HitCount => _line.HitCount;
 
     /// <summary>
     /// Name of file or id of ScriptBlock the line belongs to.
@@ -87,7 +87,7 @@ public LineProfileView(LineProfile line)
     /// <summary>
     /// Line number in the file or ScriptBlock.
     /// </summary>
-    public uint? Line => _line.Line;
+    public int? Line => _line.Line;
 
     /// <summary>
     /// Function that called this line.
@@ -117,5 +117,5 @@ public LineProfileView(LineProfile line)
     /// <summary>
     /// All command hits in this line using column as key.
     /// </summary>
-    public IDictionary<uint, CommandHit> CommandHits => _line.CommandHits;
+    public IDictionary<int, CommandHit> CommandHits => _line.CommandHits;
 }

csharp/Profiler/ProfilerTracer.cs

@@ -46,13 +46,20 @@ public class ProfilerTracer : ITracer
     // timespan ticks are 10k per millisecond, but the stopwatch can have different resolution
     // calculate the diff between the timestamps and convert it to 10k per ms ticks
     //
-    // cast the frequency to double to avoid whole number division. On systems where frequency 
+    // cast the frequency to decimal to avoid whole number division. On systems where frequency 
     // is smaller than ticks per second this otherwise results in 0, and all timestamps then
     // become positive infinity because of timestamp / 0 = ∞ or when cast to long: -9223372036854775808
-    private static double _tickDivider = ((double)Stopwatch.Frequency) / TimeSpan.TicksPerSecond;
+    private static decimal _tickDivider = ((decimal)Stopwatch.Frequency) / TimeSpan.TicksPerSecond;
     private const string ScriptBlockName = "<ScriptBlock>";
+    private readonly bool _usePreciseMemoryMeasurement;
     internal int _index = 0;
     internal Hit _previousHit;
+    internal readonly decimal _megaByte = 1024 * 1024;
+
+    public ProfilerTracer()
+    {
+        _usePreciseMemoryMeasurement = Environment.GetEnvironmentVariable("POWERSHELL_PROFILER_PRECISE_MEMORY_MEASUREMENT") == "1";
+    }
 
     public List<Hit> Hits { get; } = new List<Hit>();
     public Dictionary<Guid, ScriptBlock> ScriptBlocks { get; } = new Dictionary<Guid, ScriptBlock>();
@@ -75,9 +82,9 @@ public void Trace(string _, IScriptExtent extent, ScriptBlock scriptBlock, int l
         var gc2 = GC.CollectionCount(2);
 
 #if NET5_0_OR_GREATER
-        var allocatedBytes = GC.GetTotalAllocatedBytes(precise: false);
+        var allocatedBytes = GC.GetTotalAllocatedBytes(precise: _usePreciseMemoryMeasurement) / _megaByte;
 #else
-        var allocatedBytes = GC.GetTotalMemory(forceFullCollection: false);
+        var allocatedBytes = GC.GetTotalMemory(forceFullCollection: false) / _megaByte;
 #endif
 
         // we are using structs so we need to insert the final struct to the 
@@ -144,7 +151,7 @@ public void Trace(string _, IScriptExtent extent, ScriptBlock scriptBlock, int l
     }
 
     private void SetSelfValuesAndAddToHits(ref Hit eventRecord, long timestamp,
-        long workingSet, long heapSize, long allocatedBytes,
+        decimal workingSet, decimal heapSize, decimal allocatedBytes,
         int gc0, int gc1, int gc2)
     {
         eventRecord.SelfWorkingSet = workingSet - eventRecord.WorkingSet;

csharp/Profiler/Profiler_ProcessFunctions.cs

@@ -87,10 +87,10 @@ public static Dictionary<string, LineProfile> ProcessFunctions(List<Hit> trace)
             // on the same line so we can see which commands contributed to the line duration
             //if we need to count duration we can do it by moving this to the next part of the code
             // where we process each hit on the line
-            if (!lineProfile.CommandHits.TryGetValue((uint)hit.Column, out var commandHit))
+            if (!lineProfile.CommandHits.TryGetValue((int)hit.Column, out var commandHit))
             {
                 commandHit = new CommandHit(hit);
-                lineProfile.CommandHits.Add((uint)hit.Column, commandHit);
+                lineProfile.CommandHits.Add((int)hit.Column, commandHit);
             }
             else
             {

csharp/Profiler/Profiler_ProcessLines.cs

@@ -71,7 +71,7 @@ public static Dictionary<Guid, File> ProcessLines(List<Hit> trace, Dictionary<Gu
                 lineProfile = new LineProfile
                 {
                     File = file.Name,
-                    Line = (uint)lineNumber,
+                    Line = (int)lineNumber,
                     Text = text,
                     Function = hit.Function,
                     Module = hit.Module,
@@ -141,10 +141,10 @@ public static Dictionary<Guid, File> ProcessLines(List<Hit> trace, Dictionary<Gu
             // on the same line so we can see which commands contributed to the line duration
             // if we need to count duration we can do it by moving this to the next part of the code
             // where we process each hit on the line
-            if (!lineProfile.CommandHits.TryGetValue((uint)hit.Column, out var commandHit))
+            if (!lineProfile.CommandHits.TryGetValue((int)hit.Column, out var commandHit))
             {
                 commandHit = new CommandHit(hit);
-                lineProfile.CommandHits.Add((uint)hit.Column, commandHit);
+                lineProfile.CommandHits.Add((int)hit.Column, commandHit);
             }
             else
             {