AddSupportForExaminingTypeLoadOperations

Author: davidwrighton

src/PerfView/CommandProcessor.cs

@@ -356,6 +356,8 @@ public void Start(CommandLineArgs parsedArgs)
             if (parsedArgs.RuntimeLoading)
             {
                 parsedArgs.ClrEvents |= ClrTraceEventParser.Keywords.CompilationDiagnostic;
+                parsedArgs.ClrEvents |= ClrTraceEventParser.Keywords.MethodDiagnostic;
+                parsedArgs.ClrEvents |= ClrTraceEventParser.Keywords.TypeDiagnostic;
             }
 
             if (profilerKeywords != 0)

src/PerfView/PerfViewData.cs

@@ -3545,7 +3545,7 @@ protected override string DoCommand(string command, StatusBar worker)
                 if (m_interestingProcesses.ContainsKey(processId))
                 {
                     var proc = m_interestingEtlxProcesses[processId];
-                    var txtFile = CacheFiles.FindFile(FilePath, ".runtimeLoadertats." + processId.ToString() + ".txt");
+                    var txtFile = CacheFiles.FindFile(FilePath, ".runtimeLoaderstats." + processId.ToString() + ".txt");
                     if (!File.Exists(txtFile) || File.GetLastWriteTimeUtc(txtFile) < File.GetLastWriteTimeUtc(FilePath) ||
                         File.GetLastWriteTimeUtc(txtFile) < File.GetLastWriteTimeUtc(SupportFiles.MainAssemblyPath))
                     {

src/PerfView/UserCommands.cs

@@ -1874,7 +1874,7 @@ public static MutableTraceEventStackSource ThreadTimeStacks(this TraceLog eventL
         return stackSource;
     }
 
-    public static StackSource RuntimeOperationsStacks(this TraceLog eventLog, TraceProcess process = null, Predicate<TraceEvent> predicate = null)
+    public static StackSource RuntimeLoaderStacks(this TraceLog eventLog, TraceProcess process = null, Predicate<TraceEvent> predicate = null)
     {
         TraceEvents events;
         if (process == null)

src/TraceEvent/Computers/CLRRuntimeActivityComputer.cs

@@ -55,6 +55,7 @@ struct IncompleteActionDesc
 
         Dictionary<IdOfIncompleteAction, IncompleteActionDesc> _incompleteJitEvents = new Dictionary<IdOfIncompleteAction, IncompleteActionDesc>();
         Dictionary<IdOfIncompleteAction, IncompleteActionDesc> _incompleteR2REvents = new Dictionary<IdOfIncompleteAction, IncompleteActionDesc>();
+        Dictionary<IdOfIncompleteAction, IncompleteActionDesc> _incompleteTypeLoadEvents = new Dictionary<IdOfIncompleteAction, IncompleteActionDesc>();
 
         public Dictionary<int, List<StartStopStackMingledComputer.StartStopThreadEventData>> StartStopEvents { get; } = new Dictionary<int, List<StartStopStackMingledComputer.StartStopThreadEventData>>();
 
@@ -65,12 +66,18 @@ public CLRRuntimeActivityComputer(TraceLogEventSource source)
             source.Clr.MethodLoadVerbose += Clr_MethodLoadVerbose;
             source.Clr.MethodLoad += Clr_MethodLoad;
             source.Clr.LoaderAssemblyLoad += Clr_LoaderAssemblyLoad;
+            source.Clr.MethodR2RGetEntryPointStarted += Clr_R2RGetEntryPointStarted;
+            source.Clr.TypeLoadStart += Clr_TypeLoadStart;
+            source.Clr.TypeLoadStop += Clr_TypeLoadStop;
             source.Process();
             source.Clr.MethodJittingStarted -= Clr_MethodJittingStarted;
+            source.Clr.MethodR2RGetEntryPointStarted -= Clr_R2RGetEntryPointStarted;
             source.Clr.MethodR2RGetEntryPoint -= Clr_MethodR2RGetEntryPoint;
             source.Clr.MethodLoadVerbose -= Clr_MethodLoadVerbose;
             source.Clr.MethodLoad -= Clr_MethodLoad;
             source.Clr.LoaderAssemblyLoad -= Clr_LoaderAssemblyLoad;
+            source.Clr.TypeLoadStart -= Clr_TypeLoadStart;
+            source.Clr.TypeLoadStop -= Clr_TypeLoadStop;
         }
 
         private void AddStartStopData(int threadId, StartStopStackMingledComputer.EventUID start, StartStopStackMingledComputer.EventUID end, string name)
@@ -127,6 +134,20 @@ private void Clr_MethodJittingStarted(MethodJittingStartedTraceData obj)
             _incompleteJitEvents[id] = incompleteDesc;
         }
 
+        private void Clr_R2RGetEntryPointStarted(R2RGetEntryPointStartedTraceData obj)
+        {
+            IncompleteActionDesc incompleteDesc = new IncompleteActionDesc();
+            incompleteDesc.Start = new StartStopStackMingledComputer.EventUID(obj);
+            incompleteDesc.Name = "";
+            incompleteDesc.OperationType = "R2R";
+
+            IdOfIncompleteAction id = new IdOfIncompleteAction();
+            id.Identifier = obj.MethodID;
+            id.ThreadID = obj.ThreadID;
+
+            _incompleteR2REvents[id] = incompleteDesc;
+        }
+
         private void Clr_MethodR2RGetEntryPoint(R2RGetEntryPointTraceData obj)
         {
             IdOfIncompleteAction id = new IdOfIncompleteAction();
@@ -139,7 +160,7 @@ private void Clr_MethodR2RGetEntryPoint(R2RGetEntryPointTraceData obj)
             if (_incompleteR2REvents.TryGetValue(id, out IncompleteActionDesc r2rStartData))
             {
                 startUID = r2rStartData.Start;
-                _incompleteJitEvents.Remove(id);
+                _incompleteR2REvents.Remove(id);
             }
 
             if (obj.EntryPoint == 0)
@@ -152,5 +173,37 @@ private void Clr_MethodR2RGetEntryPoint(R2RGetEntryPointTraceData obj)
                 AddStartStopData(id.ThreadID, startUID, new StartStopStackMingledComputer.EventUID(obj), "R2R_Found" + "(" + JITStats.GetMethodName(obj) + ")");
             }
         }
+
+        private void Clr_TypeLoadStart(TypeLoadStartTraceData obj)
+        {
+            IncompleteActionDesc incompleteDesc = new IncompleteActionDesc();
+            incompleteDesc.Start = new StartStopStackMingledComputer.EventUID(obj);
+            incompleteDesc.Name = "";
+            incompleteDesc.OperationType = "TypeLoad";
+
+            IdOfIncompleteAction id = new IdOfIncompleteAction();
+            id.Identifier = obj.TypeLoadStartID;
+            id.ThreadID = obj.ThreadID;
+
+            _incompleteTypeLoadEvents[id] = incompleteDesc;
+        }
+
+        private void Clr_TypeLoadStop(TypeLoadStopTraceData obj)
+        {
+            IdOfIncompleteAction id = new IdOfIncompleteAction();
+            id.Identifier = obj.TypeLoadStartID;
+            id.ThreadID = obj.ThreadID;
+
+            // If we had a TypeLoad start lookup event, capture that start time, otherwise, use the TypeLoadStop
+            // data as both start and stop
+            StartStopStackMingledComputer.EventUID startUID = new StartStopStackMingledComputer.EventUID(obj);
+            if (_incompleteTypeLoadEvents.TryGetValue(id, out IncompleteActionDesc typeLoadStartData))
+            {
+                startUID = typeLoadStartData.Start;
+                _incompleteTypeLoadEvents.Remove(id);
+            }
+
+            AddStartStopData(id.ThreadID, startUID, new StartStopStackMingledComputer.EventUID(obj), $"TypeLoad ({obj.TypeName}, {obj.LoadLevel})");
+        }
     }
 }