Merge "ui: Move ChromeScrollJank plugin to /plugins" into main
diff --git a/src/trace_processor/perfetto_sql/stdlib/android/garbage_collection.sql b/src/trace_processor/perfetto_sql/stdlib/android/garbage_collection.sql
index 38c287c..8323366 100644
--- a/src/trace_processor/perfetto_sql/stdlib/android/garbage_collection.sql
+++ b/src/trace_processor/perfetto_sql/stdlib/android/garbage_collection.sql
@@ -106,7 +106,10 @@
CREATE PERFETTO TABLE _gc_slice_heap
AS
SELECT
- *,
+ gc_ts as ts,
+ gc_dur as dur,
+ upid, gc_id, gc_name, gc_ts, gc_dur, utid, tid, pid,
+ thread_name, process_name, last_value, value,
CASE
WHEN gc_name GLOB '*young*' THEN 'young'
WHEN gc_name GLOB '*NativeAlloc*' THEN 'native_alloc'
diff --git a/test/trace_processor/diff_tests/metrics/android/android_boot.out b/test/trace_processor/diff_tests/metrics/android/android_boot.out
index 3d69fdc..50805cf 100644
--- a/test/trace_processor/diff_tests/metrics/android/android_boot.out
+++ b/test/trace_processor/diff_tests/metrics/android/android_boot.out
@@ -33,28 +33,28 @@
num_of_processes_with_gc: 4
num_of_threads_with_gc: 4
avg_gc_duration: 260516077.75
-avg_running_gc_duration: 3902628.5
+avg_running_gc_duration: 20215729.0
full_gc_count: 4
collector_transition_gc_count: 0
young_gc_count: 0
native_alloc_gc_count: 0
explicit_gc_count: 0
alloc_gc_count: 0
-mb_per_ms_of_gc: 0.8829305684617432
+mb_per_ms_of_gc: 0.17044896080670652
}
post_boot_gc_aggregation {
total_gc_count: 4
num_of_processes_with_gc: 4
num_of_threads_with_gc: 4
avg_gc_duration: 260516077.75
-avg_running_gc_duration: 3902628.5
+avg_running_gc_duration: 20215729.0
full_gc_count: 4
collector_transition_gc_count: 0
young_gc_count: 0
native_alloc_gc_count: 0
explicit_gc_count: 0
alloc_gc_count: 0
-mb_per_ms_of_gc: 0.8829305684617432
+mb_per_ms_of_gc: 0.17044896080670652
}
post_boot_oom_adjuster_transition_counts_global {
src_bucket: "cached_app"
diff --git a/test/trace_processor/diff_tests/metrics/android/android_boot_unagg.out b/test/trace_processor/diff_tests/metrics/android/android_boot_unagg.out
index cb0d712..dcaed19 100644
--- a/test/trace_processor/diff_tests/metrics/android/android_boot_unagg.out
+++ b/test/trace_processor/diff_tests/metrics/android/android_boot_unagg.out
@@ -223,11 +223,11 @@
reclaimed_mb: 3.1430000000000002
min_heap_mb: 2.754000
max_heap_mb: 5.897000
- mb_per_ms_of_running_gc: 0.3262420579054222
+ mb_per_ms_of_running_gc: 0.07341516044319213
mb_per_ms_of_wall_gc: 0.004718018639325977
gc_dur: 666169475
- gc_running_dur: 9633951
- gc_runnable_dur: 44371461
+ gc_running_dur: 42811321
+ gc_runnable_dur: 623358154
gc_unint_io_dur: 0
gc_unint_non_io_dur: 0
gc_int_dur: 0
@@ -244,14 +244,14 @@
reclaimed_mb: 10.640000
min_heap_mb: 6.861000
max_heap_mb: 17.501000
- mb_per_ms_of_running_gc: 93.68918788028213
+ mb_per_ms_of_running_gc: 0.426417596041947
mb_per_ms_of_wall_gc: 0.18073523433053545
gc_dur: 58870646
- gc_running_dur: 113567
- gc_runnable_dur: 0
+ gc_running_dur: 24952066
+ gc_runnable_dur: 31236573
gc_unint_io_dur: 0
gc_unint_non_io_dur: 0
- gc_int_dur: 0
+ gc_int_dur: 2682007
gc_ts: 39849615741
tid: 2534
pid: 2523
@@ -263,8 +263,8 @@
gc_type: "full"
is_mark_compact: 1
gc_dur: 168393585
- gc_running_dur: 1714233
- gc_runnable_dur: 28482219
+ gc_running_dur: 8950766
+ gc_runnable_dur: 69270710
gc_unint_io_dur: 0
gc_unint_non_io_dur: 0
gc_int_dur: -1
diff --git a/test/trace_processor/diff_tests/metrics/android/android_garbage_collection_unagg.out b/test/trace_processor/diff_tests/metrics/android/android_garbage_collection_unagg.out
index 1341536..b28579b 100644
--- a/test/trace_processor/diff_tests/metrics/android/android_garbage_collection_unagg.out
+++ b/test/trace_processor/diff_tests/metrics/android/android_garbage_collection_unagg.out
@@ -7,11 +7,11 @@
reclaimed_mb: 3.1430000000000002
min_heap_mb: 2.754000
max_heap_mb: 5.897000
- mb_per_ms_of_running_gc: 0.3262420579054222
+ mb_per_ms_of_running_gc: 0.07341516044319213
mb_per_ms_of_wall_gc: 0.004718018639325977
gc_dur: 666169475
- gc_running_dur: 9633951
- gc_runnable_dur: 44371461
+ gc_running_dur: 42811321
+ gc_runnable_dur: 623358154
gc_unint_io_dur: 0
gc_unint_non_io_dur: 0
gc_int_dur: 0
@@ -28,14 +28,14 @@
reclaimed_mb: 10.640000
min_heap_mb: 6.861000
max_heap_mb: 17.501000
- mb_per_ms_of_running_gc: 93.68918788028213
+ mb_per_ms_of_running_gc: 0.426417596041947
mb_per_ms_of_wall_gc: 0.18073523433053545
gc_dur: 58870646
- gc_running_dur: 113567
- gc_runnable_dur: 0
+ gc_running_dur: 24952066
+ gc_runnable_dur: 31236573
gc_unint_io_dur: 0
gc_unint_non_io_dur: 0
- gc_int_dur: 0
+ gc_int_dur: 2682007
gc_ts: 39849615741
tid: 2534
pid: 2523
@@ -47,8 +47,8 @@
gc_type: "full"
is_mark_compact: 1
gc_dur: 168393585
- gc_running_dur: 1714233
- gc_runnable_dur: 28482219
+ gc_running_dur: 8950766
+ gc_runnable_dur: 69270710
gc_unint_io_dur: 0
gc_unint_non_io_dur: 0
gc_int_dur: -1
diff --git a/test/trace_processor/diff_tests/stdlib/android/tests.py b/test/trace_processor/diff_tests/stdlib/android/tests.py
index 1b204fc..0baf4b0 100644
--- a/test/trace_processor/diff_tests/stdlib/android/tests.py
+++ b/test/trace_processor/diff_tests/stdlib/android/tests.py
@@ -1115,10 +1115,10 @@
""",
out=Csv("""
"tid","pid","thread_name","process_name","gc_type","is_mark_compact","reclaimed_mb","min_heap_mb","gc_ts","gc_dur","gc_running_dur","gc_runnable_dur","gc_unint_io_dur","gc_unint_non_io_dur","gc_int_dur"
- 2013,2003,"HeapTaskDaemon","android.process.media","collector_transition",0,0.670000,2.153000,2.823000,326468170,80326441,11087787,0,0,10056086
- 3494,3487,"HeapTaskDaemon","com.android.providers.media.module","young",0,"[NULL]","[NULL]","[NULL]",213263593,55205035,10429437,0,0,1208604
- 3494,3487,"HeapTaskDaemon","com.android.providers.media.module","collector_transition",0,1.248000,2.201000,3.449000,169735717,65828710,20965673,0,0,0
- 3556,3549,"HeapTaskDaemon","com.android.externalstorage","collector_transition",0,0.450000,2.038000,2.488000,166379142,52906367,7881722,0,0,0
+ 2013,2003,"HeapTaskDaemon","android.process.media","collector_transition",0,0.670000,2.153000,2.823000,326468170,138781185,177630899,0,0,10056086
+ 3494,3487,"HeapTaskDaemon","com.android.providers.media.module","young",0,"[NULL]","[NULL]","[NULL]",213263593,164870500,29632860,0,0,12881595
+ 3494,3487,"HeapTaskDaemon","com.android.providers.media.module","collector_transition",0,1.248000,2.201000,3.449000,169735717,135385084,24036227,0,1301,10313105
+ 3556,3549,"HeapTaskDaemon","com.android.externalstorage","collector_transition",0,0.450000,2.038000,2.488000,166379142,123781761,32547509,0,0,10049872
"""))
def test_input_events(self):
