Accept output from "MT Count TotalSize Class Name"; no need to include "!dumpheap -stat"

Author: Christophe Nasarre

src/LeakShell/HeapSnapshotFactory.cs

@@ -10,7 +10,7 @@ public class HeapSnapshotFactory
     {
         private static readonly InvalidOperationException InvalidFormatException =
             new InvalidOperationException(
-                "Invalid !heapstat -stat list format.\r\n   Don't forget to copy the whole output; including the final \"Total ... objects\" line.");
+                "Invalid !heapstat -stat list format.\r\n   Don't forget to copy the whole output starting from \"MT    Count    TotalSize Class Name\"; including the final \"Total ... objects\" line.");
 
         /*
         !dumpheap -stat
@@ -26,6 +26,8 @@ 5fc06c28     7111       300980 System.Object[]
         5fc4f9ac     6581       381508 System.String
         Total 46832 objects
         */
+
+        private const string Header = "MT    Count    TotalSize Class Name";
         public static HeapSnapshot CreateFromHeapStat(string dumpheap)
         {
             // sanity checks
@@ -34,7 +36,7 @@ public static HeapSnapshot CreateFromHeapStat(string dumpheap)
                 throw InvalidFormatException;
             }
 
-            if (!dumpheap.Contains("!dumpheap -stat"))
+            if (!dumpheap.Contains(Header))
             {
                 throw InvalidFormatException;
             }
@@ -57,20 +59,7 @@ public static HeapSnapshot CreateFromHeapStat(string dumpheap)
                     switch (state)
                     {
                         case DumpHeapParsingState.Init:
-                            if (line.Contains("!dumpheap -stat"))
-                            {
-                                state = DumpHeapParsingState.Comment;
-                            }
-                            break;
-
-                        case DumpHeapParsingState.Comment:
-                            /*
-                                PDB symbol for clr.dll not loaded
-                                total 0 objects
-                                Statistics:
-                                        MT    Count    TotalSize Class Name
-                            */
-                            if (line.TrimStart().StartsWith("MT"))
+                            if (line.Contains(Header))
                             {
                                 state = DumpHeapParsingState.TypeEntries;
                             }
@@ -300,7 +289,6 @@ private static string GetNumberFromString(string field)
         enum DumpHeapParsingState
         {
             Init = 0,
-            Comment,
             TypeEntries,
             End,
             Error,

src/LeakShell/MainFrame.cs

@@ -440,31 +440,32 @@ private string GetExceptionMessages(Exception x)
 
 
     private void SetReferenceSnapshot(HeapSnapshot snapshot)
-{
-// sanity checks
-if (snapshot == null)
-{
-return;
-}
+    {
+        // sanity checks
+        if (snapshot == null)
+        {
+            return;
+        }
 
-// remove current "reference" item
-SnapshotListViewItem referenceItem = GetSnapshotItem(SnapshotListViewItemState.Reference);
-if (referenceItem != null)
-{
-referenceItem.State = SnapshotListViewItemState.None;
+        // remove current "reference" item
+        SnapshotListViewItem referenceItem = GetSnapshotItem(SnapshotListViewItemState.Reference);
+        if (referenceItem != null)
+        {
+            referenceItem.State = SnapshotListViewItemState.None;
 
-referenceItem.ImageIndex = -1;
-// Note: the item must be redrawn when the image is reset to -1
-lvSnapshots.RedrawItems(referenceItem.Index, referenceItem.Index, "force redraw" == null);
-}
+            referenceItem.ImageIndex = -1;
+            // Note: the item must be redrawn when the image is reset to -1
+            lvSnapshots.RedrawItems(referenceItem.Index, referenceItem.Index, "force redraw" == null);
+        }
 
-// update the new "reference" item
-SnapshotListViewItem item = GetSnapshotItem(snapshot);
-item.State = SnapshotListViewItemState.Reference;
-item.ImageIndex = ReferenceImageIndex;
+        // update the new "reference" item
+        SnapshotListViewItem item = GetSnapshotItem(snapshot);
+        item.State = SnapshotListViewItemState.Reference;
+        item.ImageIndex = ReferenceImageIndex;
+
+        _reference = snapshot;
+    }
 
-_reference = snapshot;
-}
     private void SetCurrentSnapshot(HeapSnapshot snapshot)
     {
         // sanity checks

src/LeakShell/Properties/AssemblyInfo.cs

@@ -31,8 +31,10 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.1.0")]
+[assembly: AssemblyFileVersion("1.5.1.0")]
+//
+//  1.5.1 : no need to have "!dumpheap -stat" in the text, only the "MT    Count    TotalSize Class Name" header
 //
 //  1.5.0 : [BUG] check for invalid "!dumpheap -stat" from clipboard
 //          remove dump file drag & drop with COM objects installed with DebugDiag: it is now implemented with ClrMD