Parsing of new GC events

src/EtwHeapDump/DotNetHeapDumpGraphReader.cs

@@ -182,7 +182,7 @@ internal void SetupCallbacks(MemoryGraph memoryGraph, TraceEventDispatcher sourc
             }
         };
 
-        source.Clr.GCGenAwareStart += delegate (GenAwareBeginTraceData data)
+        source.Clr.GCGenAwareBegin += delegate (GenAwareTemplateTraceData data)
         {
             m_seenStart = true;
             m_ignoreEvents = false;
@@ -266,7 +266,7 @@ internal void SetupCallbacks(MemoryGraph memoryGraph, TraceEventDispatcher sourc
             }
         };
 
-        source.Clr.GCGenAwareEnd += delegate (GenAwareEndTraceData data)
+        source.Clr.GCGenAwareEnd += delegate (GenAwareTemplateTraceData data)
         {
             m_ignoreEvents = true;
             if (m_nodeBlocks.Count == 0 && m_typeBlocks.Count == 0 && m_edgeBlocks.Count == 0)

src/PerfView/GcStats.cs

@@ -226,6 +226,20 @@ public static void ToXml(TextWriter writer, TraceProcess stats, TraceLoadedDotNe
             writer.Write("{0}<GCProcess", indent);
             writer.Write(" Process={0}", StringUtilities.QuotePadLeft(stats.Name, 10));
             writer.Write(" ProcessID={0}", StringUtilities.QuotePadLeft(stats.ProcessID.ToString(), 5));
+            if (runtime.GC.GCSettings != null)
+            {
+                writer.Write(" HardLimit=\"{0}\"", runtime.GC.GCSettings.HardLimit);
+                writer.Write(" LOHThreshold=\"{0}\"", runtime.GC.GCSettings.LOHThreshold);
+                writer.Write(" PhysicalMemoryConfig=\"{0}\"", runtime.GC.GCSettings.PhysicalMemoryConfig);
+                writer.Write(" Gen0MinBudgetConfig=\"{0}\"", runtime.GC.GCSettings.Gen0MinBudgetConfig);
+                writer.Write(" Gen0MaxBudgetConfig=\"{0}\"", runtime.GC.GCSettings.Gen0MaxBudgetConfig);
+                writer.Write(" HighMemPercentConfig=\"{0}\"", runtime.GC.GCSettings.HighMemPercentConfig);
+                writer.Write(" GCSettingsConcurrent=\"{0}\"", runtime.GC.GCSettings.BitSettings.HasFlag(GCSettingsFlags.GCSettingsConcurrent));
+                writer.Write(" GCSettingsLargePages=\"{0}\"", runtime.GC.GCSettings.BitSettings.HasFlag(GCSettingsFlags.GCSettingsLargePages));
+                writer.Write(" GCSettingsFrozenSegs=\"{0}\"", runtime.GC.GCSettings.BitSettings.HasFlag(GCSettingsFlags.GCSettingsFrozenSegs));
+                writer.Write(" GCSettingsHardLimitConfig=\"{0}\"", runtime.GC.GCSettings.BitSettings.HasFlag(GCSettingsFlags.GCSettingsHardLimitConfig));
+                writer.Write(" GCSettingsNoAffinitize=\"{0}\"", runtime.GC.GCSettings.BitSettings.HasFlag(GCSettingsFlags.GCSettingsNoAffinitize));
+            }
             if (stats.CPUMSec != 0)
             {
                 writer.Write(" ProcessCpuTimeMsec={0}", StringUtilities.QuotePadLeft(stats.CPUMSec.ToString("f0"), 5));
@@ -536,6 +550,15 @@ public static void ToXmlAttribs(TextWriter writer, TraceProcess stats, TraceLoad
                                 }
                             }
                         }
+                        if (gc.LOHCompactInfos.Count > 0)
+                        {
+                            GCLOHCompactInfo lohCompactInfo = gc.LOHCompactInfos[HeapNum];
+                            writer.Write(" LOHTimePlan =\"{0:n3}\" ", lohCompactInfo.TimePlan);
+                            writer.Write(" LOHTimeCompact =\"{0:n3}\" ", lohCompactInfo.TimeCompact);
+                            writer.Write(" LOHTimeRelocate =\"{0:n3}\" ", lohCompactInfo.TimeRelocate);
+                            writer.Write(" LOHTotalRefs =\"{0}\" ", lohCompactInfo.TotalRefs);
+                            writer.Write(" LOHZeroRefs =\"{0}\" ", lohCompactInfo.ZeroRefs);
+                        }
                     }
                     else
                     {
@@ -556,6 +579,26 @@ public static void ToXmlAttribs(TextWriter writer, TraceProcess stats, TraceLoad
                 }
                 writer.WriteLine("      </PerHeapHistories>");
             }
+            if (gc.LargestFreeListItemsBuckets.Count > 0)
+            {
+                writer.WriteLine("      <LargestFreeListItemsBuckets>");
+                for (int i = 0; i < gc.LargestFreeListItemsBuckets.Count; i++)
+                {
+                    GCFitBucket bucket = gc.LargestFreeListItemsBuckets[i];
+                    writer.WriteLine("        <Bucket Index=\"{0}\" Count=\"{1}\" Size=\"{2}\" />", bucket.Index, bucket.Count, bucket.Size);
+                }
+                writer.WriteLine("      </LargestFreeListItemsBuckets>");
+            }
+            if (gc.PlugsInCondemnedBuckets.Count > 0)
+            {
+                writer.WriteLine("      <PlugsInCondemnedBuckets>");
+                for (int i = 0; i < gc.PlugsInCondemnedBuckets.Count; i++)
+                {
+                    GCFitBucket bucket = gc.PlugsInCondemnedBuckets[i];
+                    writer.WriteLine("        <Bucket Index=\"{0}\" Count=\"{1}\" Size=\"{2}\" />", bucket.Index, bucket.Count, bucket.Size);
+                }
+                writer.WriteLine("      </PlugsInCondemnedBuckets>");
+            }
             writer.WriteLine("   </GCEvent>");
         }
 

src/PerfView/PerfViewData.cs

@@ -3828,7 +3828,7 @@ public override void Open(Window parentWindow, StatusBar worker, Action doAfter)
                     // For .NET, we are looking for a Gen 2 GC Start that is induced that has GCBulkNodes after it.   
                     var lastGCStartsRelMSec = new Dictionary<int, double>();
 
-                    source.Clr.GCGenAwareStart += delegate (Microsoft.Diagnostics.Tracing.Parsers.Clr.GenAwareBeginTraceData data)
+                    source.Clr.GCGenAwareBegin += delegate (Microsoft.Diagnostics.Tracing.Parsers.Clr.GenAwareTemplateTraceData data)
                     {
                         lastGCStartsRelMSec[data.ProcessID] = data.TimeStampRelativeMSec;
                     };