Skip to content

Commit 3170e29

Browse files
ivbergivberg
authored
Perfetto - Upgrade to latest Perfetto v38 and Protobuf 3.25.0 /w .pdb (#115)
* Perfetto - Upgrade to latest Perfetto v38 and Protobuf 3.25.0 /w .pdb
1 parent 80dc175 commit 3170e29

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

‎PerfettoCds/PerfettoCds.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Google.Protobuf" Version="3.21.11">
19+
<PackageReference Include="Google.Protobuf" Version="3.25.0">
2020
<GeneratePathProperty>true</GeneratePathProperty>
2121
</PackageReference>
2222
<PackageReference Include="Microsoft.Performance.SDK" Version="1.0.16" />
@@ -30,7 +30,7 @@
3030
<Target Name="DownloadTraceProcessorShell">
3131
<!-- Keep in sync with other DownloadTraceProcessorShell Targets -->
3232
<!-- Download the trace_processor.exe from Perfetto's GitHub release and copy it to the output directory-->
33-
<DownloadFile SourceUrl="https://github.com/google/perfetto/releases/download/v24.2/windows-amd64.zip" DestinationFolder="$(TargetDir)" />
33+
<DownloadFile SourceUrl="https://github.com/google/perfetto/releases/download/v38.0/windows-amd64.zip" DestinationFolder="$(TargetDir)" />
3434
<Unzip SourceFiles="$(TargetDir)\windows-amd64.zip" DestinationFolder="$(TargetDir)" />
3535
<Copy SourceFiles="$(TargetDir)\windows-amd64\trace_processor_shell.exe" DestinationFolder="$(TargetDir)" />
3636
<RemoveDir Directories="$(TargetDir)\windows-amd64" />
@@ -58,6 +58,7 @@
5858

5959
<Target Name="CopyRulesToTarget" AfterTargets="Build">
6060
<Copy SourceFiles="$(PkgGoogle_Protobuf)\lib\netstandard2.0\Google.Protobuf.dll" DestinationFolder="$(TargetDir)" />
61+
<Copy SourceFiles="$(PkgGoogle_Protobuf)\lib\netstandard2.0\Google.Protobuf.pdb" DestinationFolder="$(TargetDir)" />
6162
<!-- Download trace_processor_shell to the output directory if it doesn't exist -->
6263
<CallTarget Condition="!Exists('$(TargetDir)\trace_processor_shell.exe')" Targets="DownloadTraceProcessorShell" />
6364
</Target>

‎PerfettoCds/pluginManifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://raw.githubusercontent.com/microsoft/microsoft-performance-toolkit-sdk/main/src/PluginsSystem/Tools/Microsoft.Performance.Toolkit.Plugins.Cli/Manifest/PluginManifestSchema.json",
33
"identity": {
44
"id": "Microsoft.Performance.Toolkit.Plugins.PerfettoPlugin",
5-
"version": "1.5.4"
5+
"version": "1.5.5"
66
},
77
"displayName": "Perfetto for Android and Chromium logs",
88
"description": "Perfetto Android & Chromium (CPU Scheduling, CPU Sampling, CPU Frequency, FTrace, Android Logs, Generic Events / Default Tracks, GPU Counters, Jank Detection, Processes, Android Packages) - https://perfetto.dev/",

‎PerfettoProcessor/PerfettoProcessor.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.1</TargetFramework>
5-
<Version>1.5.1</Version>
5+
<Version>1.5.5</Version>
66
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
77
<Authors>Microsoft</Authors>
88
<Company>Microsoft Corp.</Company>
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Google.Protobuf" Version="3.21.11">
19+
<PackageReference Include="Google.Protobuf" Version="3.25.0">
2020
<GeneratePathProperty>true</GeneratePathProperty>
2121
</PackageReference>
2222
</ItemGroup>

‎PerfettoUnitTest/PerfettoUnitTest.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void TestAndroidTrace()
119119
Assert.IsTrue(cpuSchedEventData[0].ThreadName == "kworker/u17:9 (834)");
120120
Assert.IsTrue(cpuSchedEventData[1].EndState == "Task Dead");
121121
Assert.IsTrue(cpuSchedEventData[0].ProcessName == string.Empty);
122-
Assert.IsTrue(cpuSchedEventData[5801].EndState == "Runnable");
122+
Assert.IsTrue(cpuSchedEventData[5801].EndState == "Runnable (Preempted)");
123123
Assert.IsTrue(cpuSchedEventData[5801].ThreadName == "TraceLogApiTest (20855)");
124124
Assert.IsTrue(cpuSchedEventData[5801].ProcessName == "TraceLogApiTest (20855)");
125125

@@ -203,21 +203,22 @@ public void TestAndroid12Trace()
203203
PerfettoPluginConstants.ProcessEventCookerPath,
204204
nameof(PerfettoProcessEventCooker.ProcessEvents)));
205205

206-
Assert.IsTrue(processEventData.Count == 121);
206+
Assert.IsTrue(processEventData.Count == 266);
207207
Assert.IsTrue(processEventData[1].AndroidAppId == 10135);
208208
Assert.IsTrue(processEventData[1].Uid == 10135);
209209
Assert.IsTrue(processEventData[1].CmdLine == "com.android.systemui");
210-
Assert.IsTrue(processEventData[1].ParentUpid == 25);
210+
Assert.IsTrue(processEventData[1].ParentUpid == 158);
211211
Assert.IsTrue(processEventData[1].ParentProcess != null && processEventData[1].ParentProcess.Name == "zygote64");
212212
Assert.IsTrue(processEventData[1].Pid == 980);
213213
Assert.IsTrue(processEventData[1].Upid == 1);
214214
Assert.IsTrue(processEventData[1].StartTimestamp == Timestamp.Zero); // NULL should be at trace start
215215
Assert.IsTrue(processEventData[1].EndTimestamp == new Timestamp(39446647558)); // NULL should be at trace stop
216216

217-
Assert.IsTrue(processEventData[119].StartTimestamp == new Timestamp(33970357558));
218-
Assert.IsTrue(processEventData[119].EndTimestamp == new Timestamp(34203203358));
219-
Assert.IsTrue(processEventData[119].ParentProcess != null && processEventData[119].ParentProcess.Name == "/apex/com.android.adbd/bin/adbd");
220-
UnitTest.TestTableBuild(RuntimeExecutionResults, PerfettoProcessTable.TableDescriptor, 121);
217+
Assert.IsTrue(processEventData[264].StartTimestamp == new Timestamp(33970357558));
218+
Assert.IsTrue(processEventData[264].EndTimestamp == new Timestamp(34203203358));
219+
Assert.IsTrue(processEventData[264].ParentProcess != null && processEventData[264].ParentProcess.Name == "/apex/com.android.adbd/bin/adbd");
220+
Assert.IsTrue(processEventData[264].CmdLine == "/system/bin/sh -c cat /proc/10628/cmdline");
221+
UnitTest.TestTableBuild(RuntimeExecutionResults, PerfettoProcessTable.TableDescriptor, 266);
221222

222223
// Packages
223224
var packagesList = RuntimeExecutionResults.QueryOutput<ProcessedEventData<PerfettoPackageListEvent>>(

‎PerfettoUnitTest/PerfettoUnitTest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<Target Name="DownloadTraceProcessorShell">
3030
<!-- Keep in sync with other DownloadTraceProcessorShell Targets -->
3131
<!-- Download the trace_processor.exe from Perfetto's GitHub release and copy it to the output directory-->
32-
<DownloadFile SourceUrl="https://github.com/google/perfetto/releases/download/v24.2/windows-amd64.zip" DestinationFolder="$(TargetDir)" />
32+
<DownloadFile SourceUrl="https://github.com/google/perfetto/releases/download/v38.0/windows-amd64.zip" DestinationFolder="$(TargetDir)" />
3333
<Unzip SourceFiles="$(TargetDir)\windows-amd64.zip" DestinationFolder="$(TargetDir)" />
3434
<Copy SourceFiles="$(TargetDir)\windows-amd64\trace_processor_shell.exe" DestinationFolder="$(TargetDir)" />
3535
<RemoveDir Directories="$(TargetDir)\windows-amd64" />

0 commit comments

Comments
 (0)