fix: dedupe iOS perf samples by pid

Author: thymikee

src/platforms/ios/__tests__/perf.test.ts

@@ -263,10 +263,26 @@ test('sampleApplePerfMetrics uses xctrace Activity Monitor for iOS devices', asy
     '</node>',
     '</trace-query-result>',
   ].join('');
-  const secondCaptureXml = firstCaptureXml.replace(
-    '<duration-on-core fmt="100.00 ms">100000000</duration-on-core>',
-    '<duration-on-core fmt="350.00 ms">350000000</duration-on-core>',
-  );
+  const secondCaptureXml = firstCaptureXml
+    .replace(
+      '<duration-on-core fmt="100.00 ms">100000000</duration-on-core>',
+      '<duration-on-core fmt="350.00 ms">350000000</duration-on-core>',
+    )
+    .replace(
+      '</row><row><start-time fmt="00:00.124">124</start-time>',
+      [
+        '</row>',
+        '<row>',
+        '<start-time fmt="00:00.123">123</start-time>',
+        '<process fmt="ExampleDeviceApp (4001)"><pid fmt="4001">4001</pid></process>',
+        '<duration-on-core fmt="350.00 ms">350000000</duration-on-core>',
+        '<size-in-bytes fmt="8.00 MiB">8388608</size-in-bytes>',
+        '<pid fmt="4001">4001</pid>',
+        '</row>',
+        '<row>',
+        '<start-time fmt="00:00.124">124</start-time>',
+      ].join(''),
+    );
   let exportCount = 0;
 
   mockRunCmd.mockImplementation(async (cmd, args) => {

src/platforms/ios/perf.ts

@@ -449,10 +449,29 @@ function summarizeIosDevicePerfSnapshot(
     });
   }
 
-  const cpuTimeValues = matchedSamples
+  const latestSamplesByPid = new Map<number, IosDevicePerfProcessSample>();
+  for (const sample of matchedSamples) {
+    const previous = latestSamplesByPid.get(sample.pid);
+    if (!previous) {
+      latestSamplesByPid.set(sample.pid, sample);
+      continue;
+    }
+    latestSamplesByPid.set(sample.pid, {
+      pid: sample.pid,
+      processName: sample.processName || previous.processName,
+      cpuTimeNs: maxNullableNumber(previous.cpuTimeNs, sample.cpuTimeNs),
+      residentMemoryBytes: maxNullableNumber(
+        previous.residentMemoryBytes,
+        sample.residentMemoryBytes,
+      ),
+    });
+  }
+
+  const latestSamples = [...latestSamplesByPid.values()];
+  const cpuTimeValues = latestSamples
     .map((sample) => sample.cpuTimeNs)
     .filter((value): value is number => value !== null);
-  const residentMemoryValues = matchedSamples
+  const residentMemoryValues = latestSamples
     .map((sample) => sample.residentMemoryBytes)
     .filter((value): value is number => value !== null);
   return {
@@ -462,7 +481,7 @@ function summarizeIosDevicePerfSnapshot(
       residentMemoryValues.length > 0
         ? residentMemoryValues.reduce((total, value) => total + value, 0)
         : null,
-    matchedProcesses: uniqueStrings(matchedSamples.map((sample) => sample.processName)),
+    matchedProcesses: uniqueStrings(latestSamples.map((sample) => sample.processName)),
   };
 }
 
@@ -704,8 +723,12 @@ function resolveProcessName(
 }
 
 function readXmlAttribute(openTag: string, attribute: string): string | undefined {
-  const match = openTag.match(new RegExp(`\\b${attribute}="([^"]+)"`));
-  return match?.[1];
+  for (const match of openTag.matchAll(/\b([^\s=/>]+)="([^"]*)"/g)) {
+    if (match[1] === attribute) {
+      return match[2];
+    }
+  }
+  return undefined;
 }
 
 function resolveIosDevicePerfHint(stdout: string, stderr: string): string {
@@ -724,3 +747,9 @@ function resolveIosDevicePerfHint(stdout: string, stderr: string): string {
 function roundPercent(value: number): number {
   return Math.round(value * 10) / 10;
 }
+
+function maxNullableNumber(left: number | null, right: number | null): number | null {
+  if (left === null) return right;
+  if (right === null) return left;
+  return Math.max(left, right);
+}