Update files cloned from PerfView

src/Tools/dotnet-gcdump/DotNetHeapDump/DotNetHeapDumpGraphReader.cs

@@ -1,4 +1,4 @@
-using Graphs;
+using Graphs;
 using Microsoft.Diagnostics.Tracing;
 using Microsoft.Diagnostics.Tracing.Parsers;
 using Microsoft.Diagnostics.Tracing.Parsers.Clr;
@@ -182,6 +182,12 @@ internal void SetupCallbacks(MemoryGraph memoryGraph, TraceEventDispatcher sourc
             }
         };
 
+        source.Clr.GCGenAwareStart += delegate (GenAwareBeginTraceData data)
+        {
+            m_seenStart = true;
+            m_ignoreEvents = false;
+        };
+
         source.Clr.GCStart += delegate (GCStartTraceData data)
         {
             // If this GC is not part of a heap dump, ignore it.  
@@ -231,8 +237,6 @@ internal void SetupCallbacks(MemoryGraph memoryGraph, TraceEventDispatcher sourc
             }
         };
 
-
-
         source.Clr.GCStop += delegate (GCEndTraceData data)
         {
             if (m_ignoreEvents || data.ProcessID != m_processId)
@@ -262,6 +266,17 @@ internal void SetupCallbacks(MemoryGraph memoryGraph, TraceEventDispatcher sourc
             }
         };
 
+        source.Clr.GCGenAwareEnd += delegate (GenAwareEndTraceData data)
+        {
+            m_ignoreEvents = true;
+            if (m_nodeBlocks.Count == 0 && m_typeBlocks.Count == 0 && m_edgeBlocks.Count == 0)
+            {
+                m_log.WriteLine("Found no node events, looking for another GC");
+                m_seenStart = false;
+                return;
+            }
+        };
+
         source.Clr.TypeBulkType += delegate (GCBulkTypeTraceData data)
         {
             // Don't check m_ignoreEvents here, as BulkType events can be emitted by other events...such as the GC allocation event.
@@ -474,6 +489,9 @@ internal void SetupCallbacks(MemoryGraph memoryGraph, TraceEventDispatcher sourc
                 case 3:
                     segment.Gen3End = end;
                     break;
+                case 4:
+                    segment.Gen4End = end;
+                    break;
                 default:
                     throw new Exception("Invalid generation in GCGenerationRangeTraceData");
             }

src/Tools/dotnet-gcdump/DotNetHeapDump/DotNetHeapInfo.cs

@@ -52,6 +52,11 @@ public int GenerationFor(Address obj)
             }
         }
 
+        if (obj < m_lastSegment.Gen4End)
+        {
+            return 4;
+        }
+
         if (obj < m_lastSegment.Gen3End)
         {
             return 3;
@@ -107,14 +112,21 @@ void IFastSerializable.FromStream(Deserializer deserializer)
     #endregion
 }
 
-public class GCHeapDumpSegment : IFastSerializable
+public class GCHeapDumpSegment : IFastSerializable, IFastSerializableVersion
 {
     public Address Start { get; internal set; }
     public Address End { get; internal set; }
     public Address Gen0End { get; internal set; }
     public Address Gen1End { get; internal set; }
     public Address Gen2End { get; internal set; }
     public Address Gen3End { get; internal set; }
+    public Address Gen4End { get; internal set; }
+
+    public int Version => 1;
+
+    public int MinimumVersionCanRead => 0;
+
+    public int MinimumReaderVersion => 1;
 
     #region private
     void IFastSerializable.ToStream(Serializer serializer)
@@ -125,6 +137,7 @@ void IFastSerializable.ToStream(Serializer serializer)
         serializer.Write((long)Gen1End);
         serializer.Write((long)Gen2End);
         serializer.Write((long)Gen3End);
+        serializer.Write((long)Gen4End);
     }
 
     void IFastSerializable.FromStream(Deserializer deserializer)
@@ -135,6 +148,10 @@ void IFastSerializable.FromStream(Deserializer deserializer)
         Gen1End = (Address)deserializer.ReadInt64();
         Gen2End = (Address)deserializer.ReadInt64();
         Gen3End = (Address)deserializer.ReadInt64();
+        if (deserializer.VersionBeingRead >= 1)
+        {
+            Gen4End = (Address)deserializer.ReadInt64();
+        }
     }
     #endregion
-}
+}

src/Tools/dotnet-gcdump/DotNetHeapDump/GCHeapDump.cs

@@ -1,11 +1,10 @@
-using FastSerialization;
+using FastSerialization;
 using Graphs;
 using Microsoft.Diagnostics.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Security;
 using System.Text.RegularExpressions;
 using System.Xml;
 using Address = System.UInt64;
@@ -18,11 +17,11 @@
 public class GCHeapDump : IFastSerializable, IFastSerializableVersion
 {
     public GCHeapDump(string inputFileName) :
-        this(new Deserializer(inputFileName))
+        this(new Deserializer(inputFileName, new SerializationConfiguration() { StreamLabelWidth = StreamLabelWidth.FourBytes }))
     { }
 
     public GCHeapDump(Stream inputStream, string streamName) :
-        this(new Deserializer(inputStream, streamName))
+        this(new Deserializer(inputStream, streamName, new SerializationConfiguration() { StreamLabelWidth = StreamLabelWidth.FourBytes }))
     { }
 
     /// <summary>
@@ -110,7 +109,7 @@ public static Dictionary<int, ProcessInfo> GetProcessesWithGCHeaps()
         var ret = new Dictionary<int, ProcessInfo>();
 
         // Do the 64 bit processes first, then do us   
-        if (System.Environment.Is64BitOperatingSystem && !System.Environment.Is64BitProcess)
+        if (EnvironmentUtilities.Is64BitOperatingSystem && !EnvironmentUtilities.Is64BitProcess)
         {
             GetProcessesWithGCHeapsFromHeapDump(ret);
         }
@@ -193,7 +192,7 @@ public static Dictionary<int, ProcessInfo> GetProcessesWithGCHeaps()
     private void Write(string outputFileName)
     {
         Debug.Assert(MemoryGraph != null);
-        var serializer = new Serializer(outputFileName, this);
+        var serializer = new Serializer(new IOStreamStreamWriter(outputFileName, config: new SerializationConfiguration() { StreamLabelWidth = StreamLabelWidth.FourBytes }), this);
         serializer.Close();
     }
 
@@ -848,7 +847,7 @@ internal static void WriteGCDumpToXml(GCHeapDump gcDump, StreamWriter writer)
         writer.WriteLine("<TimeCollected>{0}</TimeCollected>", gcDump.TimeCollected);
         if (!string.IsNullOrWhiteSpace(gcDump.CollectionLog))
         {
-            writer.WriteLine("<CollectionLog>{0}</CollectionLog>", SecurityElement.Escape(gcDump.CollectionLog));
+            writer.WriteLine("<CollectionLog>{0}</CollectionLog>", XmlUtilities.XmlEscape(gcDump.CollectionLog));
         }
 
         if (!string.IsNullOrWhiteSpace(gcDump.MachineName))
@@ -858,7 +857,7 @@ internal static void WriteGCDumpToXml(GCHeapDump gcDump, StreamWriter writer)
 
         if (!string.IsNullOrWhiteSpace(gcDump.ProcessName))
         {
-            writer.WriteLine("<ProcessName>{0}</ProcessName>", SecurityElement.Escape(gcDump.ProcessName));
+            writer.WriteLine("<ProcessName>{0}</ProcessName>", XmlUtilities.XmlEscape(gcDump.ProcessName));
         }
 
         if (gcDump.ProcessID != 0)
@@ -883,7 +882,7 @@ internal static void WriteGCDumpToXml(GCHeapDump gcDump, StreamWriter writer)
             for (int i = 0; i < gcDump.CountMultipliersByType.Length; i++)
             {
                 writer.WriteLine("<CountMultipliers TypeIndex=\"{0}\" TypeName=\"{1}\" Value=\"{2:f4}\"/>", i,
-                    SecurityElement.Escape(gcDump.MemoryGraph.GetType((NodeTypeIndex)i, typeStorage).Name),
+                    XmlUtilities.XmlEscape(gcDump.MemoryGraph.GetType((NodeTypeIndex)i, typeStorage).Name),
                     gcDump.CountMultipliersByType[i]);
             }
 
@@ -1087,3 +1086,4 @@ private static float FetchFloat(XmlReader reader, string attributeName, float de
 
 
 }
+