Fix for Issue 109 - PopulateCpuWakeEvents - ---> System.ArgumentOutOfRangeException: Specified argument was out of the range of valid values. (Parameter 'index') (#110)

-Add some of the waker metadata as default hidden columns

Author: ivberg

PerfettoCds/Pipeline/CompositeDataCookers/PerfettoCpuSchedEventCooker.cs

@@ -157,14 +157,22 @@ void PopulateCpuWakeEvents(IDataExtensionRetrieval requiredData, ProcessedEventD
                 PerfettoThreadEvent wokenThread = tidToThreadMap[wokenTid];
                 string wokenThreadName = wokenThread.Name;
                 var wokenPid = wokenThread.Upid;
-                string wokenProcessName = wokenPid != null ? upidToProcessMap[wokenPid.Value].Name : wake.Args.ElementAt(0).Value.ToString(); // This field name is comms but it is woken process name.
+                object comm;
+                wake.Args.TryGetValue("comm", out comm);  // This field name is comm but it is woken process name.
+                string wokenProcessName = wokenPid != null ? upidToProcessMap[wokenPid.Value].Name : (string)comm;
 
                 string wakerThreadName = wake.ThreadName;
                 var wakerTid = wake.Tid;
                 PerfettoThreadEvent wakerThread = tidToThreadMap[wakerTid];
                 var wakerPid = wakerThread.Upid;
                 string wakerProcessName = wakerPid != null ? upidToProcessMap[wakerPid.Value].Name : String.Empty;
 
+                object prio;
+                wake.Args.TryGetValue("prio", out prio);
+                object success;
+                wake.Args.TryGetValue("success", out success);
+                object target_cpu;
+                wake.Args.TryGetValue("target_cpu", out target_cpu);
                 PerfettoCpuWakeEvent ev = new PerfettoCpuWakeEvent
                 (
                     wokenProcessName: wokenProcessName,
@@ -176,10 +184,10 @@ void PopulateCpuWakeEvents(IDataExtensionRetrieval requiredData, ProcessedEventD
                     wakerThreadName: wakerThreadName,
                     wakerTid: wakerTid,
                     timestamp: wake.StartTimestamp,
-                    success: int.Parse(wake.Args.ElementAt(3).Value.ToString()),   // Success is at index 3
+                    success: success == null ? -1 : (int)(long)success,
                     cpu: wake.Cpu,
-                    targetCpu: int.Parse(wake.Args.ElementAt(4).Value.ToString()), // TargetCpu is at index 4
-                    priority: int.Parse(wake.Args.ElementAt(2).Value.ToString())   // Priority is at index 2
+                    targetCpu: target_cpu == null ? -1 : (int)(long)target_cpu,
+                    priority: prio == null ? -1 : (int)(long)prio
                 );
 
                 this.CpuWakeEvents.AddEvent(ev);

PerfettoCds/Pipeline/Tables/PerfettoCpuSchedTable.cs

@@ -84,7 +84,19 @@ public class PerfettoCpuSchedTable
             new UIHints { Width = 70 });
 
         private static readonly ColumnConfiguration WakerPriorityColumn = new ColumnConfiguration(
-            new ColumnMetadata(new Guid("{E98DFD4E-6931-49E2-A6E5-6CAC538C7A4E}"), "WakerPriority", "Priority of the waker threadd"),
+            new ColumnMetadata(new Guid("{E98DFD4E-6931-49E2-A6E5-6CAC538C7A4E}"), "WakerPriority", "Priority of the waker thread"),
+            new UIHints { Width = 70 });
+
+        private static readonly ColumnConfiguration WakerPidColumn = new ColumnConfiguration(
+            new ColumnMetadata(new Guid("{2978F5AD-2C73-462F-8850-5910BCA6F251}"), "WakerPid", "Pid of the waker thread"),
+            new UIHints { Width = 70 });
+
+        private static readonly ColumnConfiguration WakerSuccessColumn = new ColumnConfiguration(
+            new ColumnMetadata(new Guid("{4F990FD6-9AD0-4952-B52C-3E0A15FA6A85}"), "WakerSuccess", "Success of the waker"),
+            new UIHints { Width = 70 });
+
+        private static readonly ColumnConfiguration WakerTargetCpuColumn = new ColumnConfiguration(
+            new ColumnMetadata(new Guid("{C6E97388-A240-474A-B0CD-16C66044A55F}"), "WakerTargetCpu", "Target CPU of the waker thread"),
             new UIHints { Width = 70 });
 
         private static readonly ColumnConfiguration WakeTimestampColumn = new ColumnConfiguration(
@@ -145,9 +157,12 @@ public static void BuildTable(ITableBuilder tableBuilder, IDataExtensionRetrieva
             tableGenerator.AddColumn(WakeEventFoundColumn, baseProjection.Compose(x => x.WakeEvent != null));
             tableGenerator.AddColumn(WakerProcessNameColumn, baseProjection.Compose(x => x.WakeEvent?.WakerProcessName ?? String.Empty));
             tableGenerator.AddColumn(WakerThreadNameColumn, baseProjection.Compose(x => x.WakeEvent?.WakerThreadName ?? String.Empty));
-            tableGenerator.AddColumn(WakerTidColumn, baseProjection.Compose(x => x.WakeEvent?.WakerTid ?? -1));
-            tableGenerator.AddColumn(WakerPriorityColumn, baseProjection.Compose(x => x.WakeEvent?.Priority ?? -1));
+            tableGenerator.AddColumn(WakerPidColumn, baseProjection.Compose(x => x.WakeEvent?.WakerPid ?? -1));
+            tableGenerator.AddColumn(WakerTidColumn, baseProjection.Compose(x => x.WakeEvent?.WakerTid));
+            tableGenerator.AddColumn(WakerPriorityColumn, baseProjection.Compose(x => x.WakeEvent?.Priority));
             tableGenerator.AddColumn(WakerCpuColumn, baseProjection.Compose(x => x.WakeEvent != null ? (int)x.WakeEvent.Cpu : -1));
+            tableGenerator.AddColumn(WakerSuccessColumn, baseProjection.Compose(x => x.WakeEvent?.Success));
+            tableGenerator.AddColumn(WakerTargetCpuColumn, baseProjection.Compose(x => x.WakeEvent?.TargetCpu));
             tableGenerator.AddColumn(WakeTimestampColumn, baseProjection.Compose(x => x.WakeEvent?.Timestamp ?? Timestamp.MinValue));
             tableGenerator.AddColumn(SchedulingLatencyColumn, baseProjection.Compose(x => x.SchedulingLatency));
             tableGenerator.AddColumn(WaitDurationColumn, baseProjection.Compose(x => x.WaitDuration));

PerfettoUnitTest/PerfettoUnitTest.cs

@@ -133,6 +133,12 @@ public void TestAndroidTrace()
             Assert.IsTrue(cpuSchedEventData[9581].WakeEvent.WakerTid == 19701);
             Assert.IsTrue(cpuSchedEventData[9581].WakeEvent.WakerThreadName == "kworker/u16:13");
 
+            Assert.IsTrue(cpuSchedEventData[5802].WakeEvent.WakerProcessName == "TraceLogApiTest");
+            Assert.IsTrue(cpuSchedEventData[5802].WakeEvent.WakerPid == 1);
+            Assert.IsTrue(cpuSchedEventData[5802].WakeEvent.Priority == 120);
+            Assert.IsTrue(cpuSchedEventData[5802].WakeEvent.Success == 1);
+            Assert.IsTrue(cpuSchedEventData[5802].WakeEvent.TargetCpu == 1);
+
             // Previous scheduling event validation
             Assert.IsTrue(cpuSchedEventData[9581].PreviousSchedulingEvent.EndState == "Task Dead");
             Assert.IsTrue(cpuSchedEventData[9581].PreviousSchedulingEvent.Tid == cpuSchedEventData[9581].Tid);