diff options
22 files changed, 45 insertions, 6 deletions
diff --git a/protos/perfetto/metrics/android/process_metadata.proto b/protos/perfetto/metrics/android/process_metadata.proto index fd7fe7b5d..fa766bea9 100644 --- a/protos/perfetto/metrics/android/process_metadata.proto +++ b/protos/perfetto/metrics/android/process_metadata.proto @@ -44,5 +44,8 @@ message AndroidProcessMetadata { // https://developer.android.com/guide/topics/manifest/manifest-element#uid repeated Package packages_for_uid = 8; + // Pid of the process name. + optional int64 pid = 9; + reserved 3, 4, 5, 6; } diff --git a/protos/perfetto/metrics/perfetto_merged_metrics.proto b/protos/perfetto/metrics/perfetto_merged_metrics.proto index 70235788d..5fb597dd5 100644 --- a/protos/perfetto/metrics/perfetto_merged_metrics.proto +++ b/protos/perfetto/metrics/perfetto_merged_metrics.proto @@ -42,6 +42,9 @@ message AndroidProcessMetadata { // https://developer.android.com/guide/topics/manifest/manifest-element#uid repeated Package packages_for_uid = 8; + // Pid of the process name. + optional int64 pid = 9; + reserved 3, 4, 5, 6; } diff --git a/python/perfetto/trace_processor/metrics.descriptor b/python/perfetto/trace_processor/metrics.descriptor index a977f9927..f390a023d 100644 --- a/python/perfetto/trace_processor/metrics.descriptor +++ b/python/perfetto/trace_processor/metrics.descriptor @@ -1,11 +1,12 @@ -À -6protos/perfetto/metrics/android/process_metadata.protoperfetto.protos"ô +Ò +6protos/perfetto/metrics/android/process_metadata.protoperfetto.protos"† AndroidProcessMetadata name ( Rname uid (RuidI package (2/.perfetto.protos.AndroidProcessMetadata.PackageRpackageY -packages_for_uid (2/.perfetto.protos.AndroidProcessMetadata.PackageRpackagesForUidv +packages_for_uid (2/.perfetto.protos.AndroidProcessMetadata.PackageRpackagesForUid +pid (Rpidv Package! package_name ( RpackageName( apk_version_code (RapkVersionCode diff --git a/src/trace_processor/metrics/sql/android/process_metadata.sql b/src/trace_processor/metrics/sql/android/process_metadata.sql index acaceb777..5ccf2b1d3 100644 --- a/src/trace_processor/metrics/sql/android/process_metadata.sql +++ b/src/trace_processor/metrics/sql/android/process_metadata.sql @@ -18,7 +18,8 @@ SELECT IMPORT('android.process_metadata'); DROP VIEW IF EXISTS process_metadata_table; CREATE VIEW process_metadata_table AS -SELECT * FROM android_process_metadata; +SELECT android_process_metadata.*, pid FROM android_process_metadata +JOIN process USING(upid); DROP VIEW IF EXISTS uid_package_count; CREATE VIEW uid_package_count AS @@ -43,6 +44,7 @@ SELECT NULL_IF_EMPTY(AndroidProcessMetadata( 'name', process_name, 'uid', uid, + 'pid', pid, 'package', NULL_IF_EMPTY(AndroidProcessMetadata_Package( 'package_name', package_name, 'apk_version_code', version_code, diff --git a/test/trace_processor/diff_tests/android/android_blocking_calls_cuj_metric.out b/test/trace_processor/diff_tests/android/android_blocking_calls_cuj_metric.out index 7dfad30c1..d75d44d3b 100644 --- a/test/trace_processor/diff_tests/android/android_blocking_calls_cuj_metric.out +++ b/test/trace_processor/diff_tests/android/android_blocking_calls_cuj_metric.out @@ -5,6 +5,7 @@ android_blocking_calls_cuj_metric { process { name: "com.android.systemui" uid: 10001 + pid: 1000 } ts: 2000000 dur: 15000000 @@ -22,6 +23,7 @@ android_blocking_calls_cuj_metric { process { name: "com.google.android.apps.nexuslauncher" uid: 10002 + pid: 2000 } ts: 2000000 dur: 15000000 @@ -39,6 +41,7 @@ android_blocking_calls_cuj_metric { process { name: "com.google.android.third.process" uid: 10003 + pid: 3000 } ts: 2000000 dur: 150000000 @@ -147,6 +150,7 @@ android_blocking_calls_cuj_metric { process { name: "com.android.systemui" uid: 10001 + pid: 1000 } ts: 20000000 dur: 10000000 @@ -164,6 +168,7 @@ android_blocking_calls_cuj_metric { process { name: "com.android.systemui" uid: 10001 + pid: 1000 } ts: 22000000 dur: 10000000 @@ -181,6 +186,7 @@ android_blocking_calls_cuj_metric { process { name: "com.android.systemui" uid: 10001 + pid: 1000 } ts: 40000000 dur: 10000000 diff --git a/test/trace_processor/diff_tests/android/android_blocking_calls_on_jank_cuj_metric.out b/test/trace_processor/diff_tests/android/android_blocking_calls_on_jank_cuj_metric.out index 68b3c9f81..89d7c63f7 100644 --- a/test/trace_processor/diff_tests/android/android_blocking_calls_on_jank_cuj_metric.out +++ b/test/trace_processor/diff_tests/android/android_blocking_calls_on_jank_cuj_metric.out @@ -15,6 +15,7 @@ android_blocking_calls_cuj_metric { apk_version_code: 1 debuggable: false } + pid: 1000 } ts: 0 dur: 115000000 @@ -42,6 +43,7 @@ android_blocking_calls_cuj_metric { apk_version_code: 1 debuggable: false } + pid: 1000 } ts: 0 dur: 802000000 diff --git a/test/trace_processor/diff_tests/graphics/android_jank_cuj.out b/test/trace_processor/diff_tests/graphics/android_jank_cuj.out index 5784a9844..22045da50 100644 --- a/test/trace_processor/diff_tests/graphics/android_jank_cuj.out +++ b/test/trace_processor/diff_tests/graphics/android_jank_cuj.out @@ -16,6 +16,7 @@ android_jank_cuj { apk_version_code: 1 debuggable: false } + pid: 1000 } ts: 0 dur: 123000000 @@ -196,6 +197,7 @@ android_jank_cuj { apk_version_code: 1 debuggable: false } + pid: 1000 } ts: 0 dur: 901000010 diff --git a/test/trace_processor/diff_tests/performance/frame_timeline_metric.out b/test/trace_processor/diff_tests/performance/frame_timeline_metric.out index eac9136a9..1a034f009 100644 --- a/test/trace_processor/diff_tests/performance/frame_timeline_metric.out +++ b/test/trace_processor/diff_tests/performance/frame_timeline_metric.out @@ -6,6 +6,7 @@ android_frame_timeline_metric { process { process { name: "process1" + pid: 1001 } total_frames: 2 missed_frames: 2 @@ -27,6 +28,7 @@ android_frame_timeline_metric { process { process { name: "process2" + pid: 1002 } total_frames: 2 missed_frames: 1 @@ -48,6 +50,7 @@ android_frame_timeline_metric { process { process { name: "process3" + pid: 1003 } total_frames: 2 missed_frames: 2 @@ -69,6 +72,7 @@ android_frame_timeline_metric { process { process { name: "process4" + pid: 1004 } total_frames: 5 missed_frames: 4 diff --git a/test/trace_processor/diff_tests/profiling/heap_stats_closest_proc.out b/test/trace_processor/diff_tests/profiling/heap_stats_closest_proc.out index 1ee09bf04..9a786535e 100644 --- a/test/trace_processor/diff_tests/profiling/heap_stats_closest_proc.out +++ b/test/trace_processor/diff_tests/profiling/heap_stats_closest_proc.out @@ -4,6 +4,7 @@ java_heap_stats { process { name: "proc1" uid: 1000 + pid: 2 } samples { ts: 200000000 @@ -28,6 +29,7 @@ java_heap_stats { process { name: "proc2" uid: 1000 + pid: 3 } samples { ts: 1500000000 diff --git a/test/trace_processor/diff_tests/profiling/java_heap_histogram.out b/test/trace_processor/diff_tests/profiling/java_heap_histogram.out index 206dc7ccb..c5aaf4924 100644 --- a/test/trace_processor/diff_tests/profiling/java_heap_histogram.out +++ b/test/trace_processor/diff_tests/profiling/java_heap_histogram.out @@ -3,7 +3,8 @@ java_heap_histogram { upid: 2 process { name: "system_server" - uid: 1000 + uid: 1000, + pid: 2 } samples { ts: 10 diff --git a/test/trace_processor/diff_tests/profiling/tests.py b/test/trace_processor/diff_tests/profiling/tests.py index e56fbffae..4c5c2e313 100644 --- a/test/trace_processor/diff_tests/profiling/tests.py +++ b/test/trace_processor/diff_tests/profiling/tests.py @@ -116,6 +116,7 @@ class Profiling(TestSuite): process { name: "system_server" uid: 1000 + pid: 2 } mappings { path: "[anon: libc_malloc]" diff --git a/test/trace_processor/diff_tests/profiling/tests_metrics.py b/test/trace_processor/diff_tests/profiling/tests_metrics.py index 9be74232a..9a4ff07c3 100644 --- a/test/trace_processor/diff_tests/profiling/tests_metrics.py +++ b/test/trace_processor/diff_tests/profiling/tests_metrics.py @@ -71,6 +71,7 @@ class ProfilingMetrics(TestSuite): process { name: "system_server" uid: 1000 + pid: 2 } samples { ts: 10 diff --git a/test/trace_processor/diff_tests/startup/android_startup.out b/test/trace_processor/diff_tests/startup/android_startup.out index 48fa752ba..18b879c9d 100644 --- a/test/trace_processor/diff_tests/startup/android_startup.out +++ b/test/trace_processor/diff_tests/startup/android_startup.out @@ -42,7 +42,8 @@ android_startup { package_name: "com.google.android.calendar" apk_version_code: 123 debuggable: false - } + }, + pid: 3 } report_fully_drawn { dur_ns: 198 diff --git a/test/trace_processor/diff_tests/startup/android_startup_attribution.out b/test/trace_processor/diff_tests/startup/android_startup_attribution.out index fb632382e..ea96296b7 100644 --- a/test/trace_processor/diff_tests/startup/android_startup_attribution.out +++ b/test/trace_processor/diff_tests/startup/android_startup_attribution.out @@ -68,6 +68,7 @@ android_startup { apk_version_code: 123 debuggable: false } + pid: 3 } event_timestamps { intent_received: 100 diff --git a/test/trace_processor/diff_tests/startup/android_startup_attribution_slow.out b/test/trace_processor/diff_tests/startup/android_startup_attribution_slow.out index 80f6f81f7..4bf3fff3e 100644 --- a/test/trace_processor/diff_tests/startup/android_startup_attribution_slow.out +++ b/test/trace_processor/diff_tests/startup/android_startup_attribution_slow.out @@ -64,6 +64,7 @@ android_startup { apk_version_code: 123 debuggable: false } + pid: 3 } event_timestamps { intent_received: 100000000000 diff --git a/test/trace_processor/diff_tests/startup/android_startup_breakdown.out b/test/trace_processor/diff_tests/startup/android_startup_breakdown.out index 52dd550bd..2f930d3f3 100644 --- a/test/trace_processor/diff_tests/startup/android_startup_breakdown.out +++ b/test/trace_processor/diff_tests/startup/android_startup_breakdown.out @@ -70,6 +70,7 @@ android_startup { apk_version_code: 123 debuggable: false } + pid: 3 } activities { name: "com.google.android.calendar.MainActivity" diff --git a/test/trace_processor/diff_tests/startup/android_startup_breakdown_slow.out b/test/trace_processor/diff_tests/startup/android_startup_breakdown_slow.out index 254759a5c..441709154 100644 --- a/test/trace_processor/diff_tests/startup/android_startup_breakdown_slow.out +++ b/test/trace_processor/diff_tests/startup/android_startup_breakdown_slow.out @@ -70,6 +70,7 @@ android_startup { apk_version_code: 123 debuggable: false } + pid: 3 } activities { name: "com.google.android.calendar.MainActivity" diff --git a/test/trace_processor/diff_tests/startup/android_startup_lock_contention.out b/test/trace_processor/diff_tests/startup/android_startup_lock_contention.out index e570b2212..ba1311c7f 100644 --- a/test/trace_processor/diff_tests/startup/android_startup_lock_contention.out +++ b/test/trace_processor/diff_tests/startup/android_startup_lock_contention.out @@ -55,6 +55,7 @@ android_startup { apk_version_code: 123 debuggable: false } + pid: 3 } event_timestamps { intent_received: 110 diff --git a/test/trace_processor/diff_tests/startup/android_startup_lock_contention_slow.out b/test/trace_processor/diff_tests/startup/android_startup_lock_contention_slow.out index cd5dc6c83..aa4ec05bf 100644 --- a/test/trace_processor/diff_tests/startup/android_startup_lock_contention_slow.out +++ b/test/trace_processor/diff_tests/startup/android_startup_lock_contention_slow.out @@ -55,6 +55,7 @@ android_startup { apk_version_code: 123 debuggable: false } + pid: 3 } event_timestamps { intent_received: 110000000000 diff --git a/test/trace_processor/diff_tests/startup/android_startup_minsdk33.out b/test/trace_processor/diff_tests/startup/android_startup_minsdk33.out index 1723d34fb..2a8307b07 100644 --- a/test/trace_processor/diff_tests/startup/android_startup_minsdk33.out +++ b/test/trace_processor/diff_tests/startup/android_startup_minsdk33.out @@ -63,6 +63,7 @@ android_startup { apk_version_code: 123 debuggable: true } + pid: 3 } event_timestamps { intent_received: 220 diff --git a/test/trace_processor/diff_tests/startup/android_startup_process_track.out b/test/trace_processor/diff_tests/startup/android_startup_process_track.out index 41b26e5e2..561fb0d2e 100644 --- a/test/trace_processor/diff_tests/startup/android_startup_process_track.out +++ b/test/trace_processor/diff_tests/startup/android_startup_process_track.out @@ -51,6 +51,7 @@ android_startup { apk_version_code: 123 debuggable: false } + pid: 3 } event_timestamps { intent_received: 100 @@ -118,6 +119,7 @@ android_startup { apk_version_code: 123 debuggable: false } + pid: 4 } event_timestamps { intent_received: 200 diff --git a/test/trace_processor/diff_tests/startup/android_startup_slow.out b/test/trace_processor/diff_tests/startup/android_startup_slow.out index 53d53b904..f791fd655 100644 --- a/test/trace_processor/diff_tests/startup/android_startup_slow.out +++ b/test/trace_processor/diff_tests/startup/android_startup_slow.out @@ -43,6 +43,7 @@ android_startup { apk_version_code: 123 debuggable: false } + pid: 3 } report_fully_drawn { dur_ns: 198000000000 |