Merge branch 'main' into dev/annabauza/android_users_table_processor

Change-Id: I9a53d68a4ad475984f715f420d7cc498b987a053

Author: annathedroid

Android.bp

@@ -15327,6 +15327,7 @@ genrule {
         "src/trace_processor/perfetto_sql/stdlib/android/surfaceflinger.sql",
         "src/trace_processor/perfetto_sql/stdlib/android/suspend.sql",
         "src/trace_processor/perfetto_sql/stdlib/android/thread.sql",
+        "src/trace_processor/perfetto_sql/stdlib/android/user_list.sql",
         "src/trace_processor/perfetto_sql/stdlib/android/version.sql",
         "src/trace_processor/perfetto_sql/stdlib/android/wakeups.sql",
         "src/trace_processor/perfetto_sql/stdlib/android/winscope/inputmethod.sql",

BUILD

@@ -3233,6 +3233,7 @@ perfetto_filegroup(
         "src/trace_processor/perfetto_sql/stdlib/android/surfaceflinger.sql",
         "src/trace_processor/perfetto_sql/stdlib/android/suspend.sql",
         "src/trace_processor/perfetto_sql/stdlib/android/thread.sql",
+        "src/trace_processor/perfetto_sql/stdlib/android/user_list.sql",
         "src/trace_processor/perfetto_sql/stdlib/android/version.sql",
         "src/trace_processor/perfetto_sql/stdlib/android/wakeups.sql",
     ],

src/trace_processor/perfetto_sql/stdlib/android/BUILD.gn

@@ -62,6 +62,7 @@ perfetto_sql_source_set("android") {
     "surfaceflinger.sql",
     "suspend.sql",
     "thread.sql",
+    "user_list.sql",
     "version.sql",
     "wakeups.sql",
   ]

src/trace_processor/perfetto_sql/stdlib/android/user_list.sql

@@ -0,0 +1,28 @@
+--
+-- Copyright 22025 The Android Open Source Project
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     https://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+-- Android user list.
+--
+CREATE PERFETTO VIEW android_user_list (
+  -- Android user id
+  user_id LONG,
+  -- User type
+  type STRING
+) AS
+SELECT
+  user_id,
+  type
+FROM __intrinsic_user_list;

src/trace_processor/perfetto_sql/stdlib/prelude/after_eof/views.sql

@@ -194,20 +194,6 @@ SELECT
   *
 FROM __intrinsic_thread;
 
--- Android users.
---
--- NOTE: sorted by Android user id
-CREATE PERFETTO VIEW android_users (
-  -- Android user id
-  uid LONG,
-  -- User type
-  type STRING
-) AS
-SELECT
-  uid,
-  type
-FROM __intrinsic_user_list;
-
 -- Contains information of processes seen during the trace.
 CREATE PERFETTO VIEW process (
   -- The id of the process. Prefer using `upid` instead.

src/trace_processor/storage/trace_storage.h

@@ -548,10 +548,12 @@ class TraceStorage {
     return &package_list_table_;
   }
 
-  const tables::UserListTable& user_list_table() const {
+  const tables::AndroidUserListTable& user_list_table() const {
     return user_list_table_;
   }
-  tables::UserListTable* mutable_user_list_table() { return &user_list_table_; }
+  tables::AndroidUserListTable* mutable_user_list_table() {
+    return &user_list_table_;
+  }
 
   const tables::AndroidGameInterventionListTable&
   android_game_intervention_list_table() const {
@@ -1194,7 +1196,7 @@ class TraceStorage {
   tables::PerfSampleTable perf_sample_table_{&string_pool_};
   tables::InstrumentsSampleTable instruments_sample_table_{&string_pool_};
   tables::PackageListTable package_list_table_{&string_pool_};
-  tables::UserListTable user_list_table_{&string_pool_};
+  tables::AndroidUserListTable user_list_table_{&string_pool_};
   tables::AndroidGameInterventionListTable
       android_game_intervention_list_table_{&string_pool_};
   tables::ProfilerSmapsTable profiler_smaps_table_{&string_pool_};

src/trace_processor/tables/profiler_tables.py

@@ -244,11 +244,11 @@
 
 USER_LIST_TABLE = Table(
     python_module=__file__,
-    class_name='UserListTable',
+    class_name='AndroidUserListTable',
     sql_name='__intrinsic_user_list',
     columns=[
         C('type', CppString()),
-        C('uid', CppInt64()),
+        C('user_id', CppInt64()),
     ],
     tabledoc=TableDoc(
         doc='''
@@ -258,7 +258,7 @@
         group='Misc',
         columns={
             'type': '''user type eg. SECONDARY''',
-            'uid': '''User id on device''',
+            'user_id': '''User id on device''',
         }))
 
 STACK_PROFILE_MAPPING_TABLE = Table(
@@ -1172,13 +1172,13 @@
     INSTRUMENTS_SAMPLE_TABLE,
     HEAP_PROFILE_ALLOCATION_TABLE,
     PACKAGE_LIST_TABLE,
-    USER_LIST_TABLE,
     PERF_SAMPLE_TABLE,
     PERF_SESSION_TABLE,
     PROFILER_SMAPS_TABLE,
     STACK_PROFILE_CALLSITE_TABLE,
     STACK_PROFILE_FRAME_TABLE,
     STACK_PROFILE_MAPPING_TABLE,
     SYMBOL_TABLE,
+    USER_LIST_TABLE,
     VULKAN_MEMORY_ALLOCATIONS_TABLE,
 ]

test/trace_processor/diff_tests/tables/tests.py

@@ -593,14 +593,17 @@ def test_ftrace_user_list(self):
     return DiffTestBlueprint(
         trace=DataPath('trace_user_list.pftrace'),
         query="""
+        INCLUDE PERFETTO MODULE android.user_list;
+
+
         SELECT
-          uid,
+          user_id,
           type
-        FROM android_users
-        ORDER BY uid;
+        FROM android_user_list
+        ORDER BY user_id;
         """,
         out=Csv("""
-        "uid","type" 
+        "user_id","type" 
         0,"android.os.usertype.system.HEADLESS" 
         10,"android.os.usertype.full.SECONDARY" 
         11,"android.os.usertype.full.GUEST"