Align GenericEvents process & thread display with CPU Scheduling (#49)

* Align GenericEvents process & thread display with CPU Scheduling to make it easier to find the exact thread that is consuming CPU between tables

Author: ivberg

PerfettoCds/Pipeline/CompositeDataCookers/PerfettoCpuSchedEventCooker.cs

@@ -52,16 +52,24 @@ public void OnDataAvailable(IDataExtensionRetrieval requiredData)
             // those respective tables
             var joined = from schedSlice in schedSliceData
                          join thread in threadData on schedSlice.Utid equals thread.Utid
-                         join process in processData on thread.Upid equals process.Upid into pd from process in pd.DefaultIfEmpty()
-                         select new { schedSlice, thread, process };
+                         join threadProcess in processData on thread.Upid equals threadProcess.Upid into pd from threadProcess in pd.DefaultIfEmpty()
+                         select new { schedSlice, thread, threadProcess };
 
             // Create events out of the joined results
             foreach (var result in joined)
             {
+                // An event can have a thread+process or just a process
+                string processName = string.Empty;
+                string threadName = $"{result.thread.Name} ({result.thread.Tid})";
+                if (result.threadProcess != null)
+                {
+                    processName = $"{result.threadProcess.Name} ({result.threadProcess.Pid})";
+                }
+
                 PerfettoCpuSchedEvent ev = new PerfettoCpuSchedEvent
                 (
-                    result.process?.Name,
-                    result.thread.Name,
+                    processName,
+                    threadName,
                     new TimestampDelta(result.schedSlice.Duration),
                     new Timestamp(result.schedSlice.RelativeTimestamp),
                     new Timestamp(result.schedSlice.RelativeTimestamp + result.schedSlice.Duration),

PerfettoCds/Pipeline/CompositeDataCookers/PerfettoFtraceEventCooker.cs

@@ -64,9 +64,9 @@ public void OnDataAvailable(IDataExtensionRetrieval requiredData)
             // Thread and process info is contained in their respective tables
             var joined = from raw in rawData
                          join thread in threadData on raw.Utid equals thread.Utid
-                         join process in processData on thread.Upid equals process.Upid into pd from process in pd.DefaultIfEmpty()
+                         join threadProcess in processData on thread.Upid equals threadProcess.Upid into pd from threadProcess in pd.DefaultIfEmpty()
                          join arg in argsData on raw.ArgSetId equals arg.ArgSetId into args
-                         select new { raw, args, thread, process };
+                         select new { raw, args, thread, threadProcess };
 
             // Create events out of the joined results
             foreach (var result in joined)
@@ -102,11 +102,19 @@ join arg in argsData on raw.ArgSetId equals arg.ArgSetId into args
                     }
                 }
 
+                // An event can have a thread+process or just a process
+                string processName = string.Empty;
+                string threadName = $"{result.thread.Name} ({result.thread.Tid})";
+                if (result.threadProcess != null)
+                {
+                    processName = $"{result.threadProcess.Name} ({result.threadProcess.Pid})";
+                }
+
                 PerfettoFtraceEvent ev = new PerfettoFtraceEvent
                 (
                     new Timestamp(result.raw.RelativeTimestamp),
-                    result.process?.Name,
-                    result.thread.Name,
+                    processName,
+                    threadName,
                     result.raw.Cpu,
                     result.raw.Name,
                     values, 

PerfettoCds/Pipeline/CompositeDataCookers/PerfettoGenericEventCooker.cs

@@ -227,16 +227,19 @@ join processTrack in processTrackData on slice.TrackId equals processTrack.Id in
 
                 string processName = string.Empty;
                 string threadName = string.Empty;
+                if (result.thread != null)
+                {
+                    threadName = $"{result.thread.Name} ({result.thread.Tid})";
+                }
 
                 // An event can have a thread+process or just a process
                 if (result.threadProcess != null)
                 {
-                    processName = $"{result.threadProcess.Name} {result.threadProcess.Pid}";
-                    threadName = $"{result.thread.Name} {result.thread.Tid}";
+                    processName = $"{result.threadProcess.Name} ({result.threadProcess.Pid})";
                 }
-                if (result.process != null)
+                else if (result.process != null)
                 {
-                    processName = $"{result.process.Name} {result.process.Pid}";
+                    processName = $"{result.process.Name} ({result.process.Pid})";
                 }
 
                 int parentTreeDepthLevel = 0;

PerfettoCds/Pipeline/Tables/PerfettoCpuSchedTable.cs

@@ -101,7 +101,7 @@ public static void BuildTable(ITableBuilder tableBuilder, IDataExtensionRetrieva
 
             // We want to exclude the idle thread ('swapper' on Android/Linux) from the display because it messes up CPU usage and clutters
             // the scheduler view
-            const string swapperIdleFilter = "[Thread]:=\"swapper\"";
+            const string swapperIdleFilter = "[Thread]:=\"swapper (0)\"";
 
             var cpuSchedConfig = new TableConfiguration("CPU Scheduling")
             {

PerfettoUnitTest/PerfettoUnitTest.cs

@@ -66,28 +66,28 @@ public void TestAndroidTrace()
                     nameof(PerfettoGenericEventCooker.GenericEvents)));
             Assert.IsTrue(genericEventData.Count == 1);
             Assert.IsTrue(genericEventData[0].EventName == "Hello Trace");
-            Assert.IsTrue(genericEventData[0].Thread == "TraceLogApiTest 20855");
-            Assert.IsTrue(genericEventData[0].Process == "TraceLogApiTest 20855");
+            Assert.IsTrue(genericEventData[0].Thread == "TraceLogApiTest (20855)");
+            Assert.IsTrue(genericEventData[0].Process == "TraceLogApiTest (20855)");
 
             var cpuSchedEventData = RuntimeExecutionResults.QueryOutput<ProcessedEventData<PerfettoCpuSchedEvent>>(
                 new DataOutputPath(
                     PerfettoPluginConstants.CpuSchedEventCookerPath,
                     nameof(PerfettoCpuSchedEventCooker.CpuSchedEvents)));
             Assert.IsTrue(cpuSchedEventData.Count == 15267);
-            Assert.IsTrue(cpuSchedEventData[0].ThreadName == "kworker/u17:9");
+            Assert.IsTrue(cpuSchedEventData[0].ThreadName == "kworker/u17:9 (834)");
             Assert.IsTrue(cpuSchedEventData[1].EndState == "Task Dead");
             Assert.IsTrue(cpuSchedEventData[0].ProcessName == string.Empty);
 
             Assert.IsTrue(cpuSchedEventData[5801].EndState == "Runnable");
-            Assert.IsTrue(cpuSchedEventData[5801].ThreadName == "TraceLogApiTest");
-            Assert.IsTrue(cpuSchedEventData[5801].ProcessName == "TraceLogApiTest");
+            Assert.IsTrue(cpuSchedEventData[5801].ThreadName == "TraceLogApiTest (20855)");
+            Assert.IsTrue(cpuSchedEventData[5801].ProcessName == "TraceLogApiTest (20855)");
 
             var ftraceEventData = RuntimeExecutionResults.QueryOutput<ProcessedEventData<PerfettoFtraceEvent>>(
                 new DataOutputPath(
                     PerfettoPluginConstants.FtraceEventCookerPath,
                     nameof(PerfettoFtraceEventCooker.FtraceEvents)));
             Assert.IsTrue(ftraceEventData.Count == 35877);
-            Assert.IsTrue(ftraceEventData[0].ThreadName == "swapper");
+            Assert.IsTrue(ftraceEventData[0].ThreadName == "swapper (0)");
             Assert.IsTrue(ftraceEventData[1].Cpu == 3);
 
             var cpuFreqEventData = RuntimeExecutionResults.QueryOutput<ProcessedEventData<PerfettoCpuFrequencyEvent>>(
@@ -132,14 +132,14 @@ public void TestChromeTrace()
                     nameof(PerfettoGenericEventCooker.GenericEvents)));
             Assert.IsTrue(genericEventData.Count == 147906);
             Assert.IsTrue(genericEventData[1].EventName == "PipelineReporter");
-            Assert.IsTrue(genericEventData[1].Process == "Renderer 27768");
+            Assert.IsTrue(genericEventData[1].Process == "Renderer (27768)");
             Assert.IsTrue(genericEventData[1].ParentId == null);
             Assert.IsTrue(genericEventData[1].ParentTreeDepthLevel == 0);
             Assert.IsTrue(genericEventData[1].ParentEventNameTree[0] == "[Root]");
             Assert.IsTrue(genericEventData[1].ParentEventNameTree[1] == "PipelineReporter");
 
             Assert.IsTrue(genericEventData[2].EventName == "BeginImplFrameToSendBeginMainFrame");
-            Assert.IsTrue(genericEventData[2].Process == "Renderer 27768");
+            Assert.IsTrue(genericEventData[2].Process == "Renderer (27768)");
             Assert.IsTrue(genericEventData[2].ParentId == 1);
             Assert.IsTrue(genericEventData[2].ParentTreeDepthLevel == 1);
             Assert.IsTrue(genericEventData[2].ParentEventNameTree[1] == "PipelineReporter");