Merge branch 'main' into dev/annabauza/android_users_table_probes

Change-Id: I4a9687985a2c7a7cb84da0b74ead53e96aa1cfda

Author: annathedroid

Android.bp

@@ -715,6 +715,8 @@ perfetto_cc_library(
             ":src_traced_probes_sys_stats_sys_stats",
             ":src_traced_probes_system_info_cpu_info_features_allowlist",
             ":src_traced_probes_system_info_system_info",
+            ":src_traced_probes_user_list_user_list",
+            ":src_traced_probes_user_list_user_list_parser",
             ":src_tracing_ipc_producer_producer",
         ],
     }),
@@ -2177,8 +2179,8 @@ perfetto_filegroup(
         "src/trace_processor/importers/perf/perf_event.h",
         "src/trace_processor/importers/perf/perf_event_attr.cc",
         "src/trace_processor/importers/perf/perf_event_attr.h",
-        "src/trace_processor/importers/perf/perf_session.cc",
-        "src/trace_processor/importers/perf/perf_session.h",
+        "src/trace_processor/importers/perf/perf_invocation.cc",
+        "src/trace_processor/importers/perf/perf_invocation.h",
         "src/trace_processor/importers/perf/reader.h",
         "src/trace_processor/importers/perf/record.h",
     ],
@@ -4344,6 +4346,24 @@ perfetto_filegroup(
     ],
 )
 
+# GN target: //src/traced/probes/user_list:user_list
+perfetto_filegroup(
+    name = "src_traced_probes_user_list_user_list",
+    srcs = [
+        "src/traced/probes/user_list/user_list_data_source.cc",
+        "src/traced/probes/user_list/user_list_data_source.h",
+    ],
+)
+
+# GN target: //src/traced/probes/user_list:user_list_parser
+perfetto_filegroup(
+    name = "src_traced_probes_user_list_user_list_parser",
+    srcs = [
+        "src/traced/probes/user_list/user_list_parser.cc",
+        "src/traced/probes/user_list/user_list_parser.h",
+    ],
+)
+
 # GN target: //src/traced/probes:data_source
 perfetto_filegroup(
     name = "src_traced_probes_data_source",
@@ -5449,6 +5469,7 @@ perfetto_proto_library(
         "protos/perfetto/config/android/protolog_config.proto",
         "protos/perfetto/config/android/surfaceflinger_layers_config.proto",
         "protos/perfetto/config/android/surfaceflinger_transactions_config.proto",
+        "protos/perfetto/config/android/user_list_config.proto",
         "protos/perfetto/config/android/windowmanager_config.proto",
     ],
     visibility = [
@@ -6265,6 +6286,7 @@ perfetto_proto_library(
         "protos/perfetto/trace/android/network_trace.proto",
         "protos/perfetto/trace/android/packages_list.proto",
         "protos/perfetto/trace/android/pixel_modem_events.proto",
+        "protos/perfetto/trace/android/user_list.proto",
     ],
     visibility = [
         PERFETTO_CONFIG.proto_library_visibility,

BUILD

@@ -4,6 +4,9 @@ Unreleased:
       by default (set it explicitly to false to revert to previous encoding,
       which is now deprecated). This reduces trace size when recording events
       that aren't know by perfetto at compile time.
+    * SharedMemoryArbiter: Reduced CPU usage when tracing high-throughput
+      workloads by preventing duplicate immediate flush tasks when the shared
+      memory buffer is more than half full.
   SQL Standard library:
     *
   Trace Processor:
@@ -24,7 +27,8 @@ Unreleased:
       from JSON traces. Processes and threads with lower sort index values
       will appear first in the UI.
   SDK:
-    *
+    * Reduced CPU usage when tracing high-throughput workloads by preventing
+      duplicate immediate flush tasks in the shared memory arbiter.
 
 v52.0 - 2025-09-16:
   Tracing service and probes:

CHANGELOG

@@ -13,6 +13,9 @@
     {
       "name": "CtsPerfettoTestCases"
     },
+    {
+      "name": "CtsPerfettoReporterTestCases"
+    },
     // Additional presubmit tests that explicitly exercise
     // Perfetto's backend
     {

TEST_MAPPING

@@ -45,7 +45,8 @@ namespace perfetto::base::flags {
         : NonAndroidPlatformDefault_FALSE)                             \
   X(use_rt_mutex, NonAndroidPlatformDefault_FALSE)                     \
   X(use_rt_futex, NonAndroidPlatformDefault_FALSE)                     \
-  X(buffer_clone_preserve_read_iter, NonAndroidPlatformDefault_TRUE)
+  X(buffer_clone_preserve_read_iter, NonAndroidPlatformDefault_TRUE)   \
+  X(sma_prevent_duplicate_immediate_flushes, NonAndroidPlatformDefault_TRUE)
 
 ////////////////////////////////////////////////////////////////////////////////
 //                                                                            //

include/perfetto/ext/base/flags.h

@@ -61,6 +61,7 @@ PERFETTO_PB_MSG_DECL(perfetto_protos_SysStatsConfig);
 PERFETTO_PB_MSG_DECL(perfetto_protos_SystemInfoConfig);
 PERFETTO_PB_MSG_DECL(perfetto_protos_TestConfig);
 PERFETTO_PB_MSG_DECL(perfetto_protos_TrackEventConfig);
+PERFETTO_PB_MSG_DECL(perfetto_protos_UserListConfig);
 PERFETTO_PB_MSG_DECL(perfetto_protos_V8Config);
 PERFETTO_PB_MSG_DECL(perfetto_protos_VulkanMemoryConfig);
 PERFETTO_PB_MSG_DECL(perfetto_protos_WindowManagerConfig);
@@ -320,6 +321,11 @@ PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
                   perfetto_protos_CpuPerUidConfig,
                   cpu_per_uid_config,
                   137);
+PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
+                  MSG,
+                  perfetto_protos_UserListConfig,
+                  user_list_config,
+                  138);
 PERFETTO_PB_FIELD(perfetto_protos_DataSourceConfig,
                   STRING,
                   const char*,

include/perfetto/public/protos/config/data_source_config.pzc.h

@@ -104,6 +104,7 @@ PERFETTO_PB_MSG_DECL(perfetto_protos_TransactionTraceEntry);
 PERFETTO_PB_MSG_DECL(perfetto_protos_TranslationTable);
 PERFETTO_PB_MSG_DECL(perfetto_protos_Trigger);
 PERFETTO_PB_MSG_DECL(perfetto_protos_UiState);
+PERFETTO_PB_MSG_DECL(perfetto_protos_UserList);
 PERFETTO_PB_MSG_DECL(perfetto_protos_V8CodeMove);
 PERFETTO_PB_MSG_DECL(perfetto_protos_V8InternalCode);
 PERFETTO_PB_MSG_DECL(perfetto_protos_V8JsCode);
@@ -564,6 +565,11 @@ PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
                   perfetto_protos_EvdevEvent,
                   evdev_event,
                   121);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_UserList,
+                  user_list,
+                  123);
 PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
                   MSG,
                   perfetto_protos_TestEvent,

include/perfetto/public/protos/trace/trace_packet.pzc.h

@@ -56,3 +56,10 @@ flag {
   bug: "448604718"
   is_fixed_read_only: true
 }
+flag {
+  name: "sma_prevent_duplicate_immediate_flushes"
+  namespace: "perfetto"
+  description: "Controls whether SharedMemoryArbiter will prevent posting duplicate immediate flush tasks when the shared memory buffer is more than half full. When enabled, only one immediate flush task is posted until it completes, preventing excessive CPU usage from task runner spam."
+  bug: "330580374"
+  is_fixed_read_only: true
+}

perfetto_flags.aconfig

@@ -33,6 +33,7 @@ perfetto_proto_library("@TYPE@") {
     "protolog_config.proto",
     "surfaceflinger_layers_config.proto",
     "surfaceflinger_transactions_config.proto",
+    "user_list_config.proto",
     "windowmanager_config.proto",
   ]
 }

protos/perfetto/config/android/BUILD.gn

@@ -33,6 +33,7 @@ import "protos/perfetto/config/android/pixel_modem_config.proto";
 import "protos/perfetto/config/android/protolog_config.proto";
 import "protos/perfetto/config/android/surfaceflinger_layers_config.proto";
 import "protos/perfetto/config/android/surfaceflinger_transactions_config.proto";
+import "protos/perfetto/config/android/user_list_config.proto";
 import "protos/perfetto/config/android/windowmanager_config.proto";
 import "protos/perfetto/config/chrome/chrome_config.proto";
 import "protos/perfetto/config/chrome/v8_config.proto";
@@ -59,7 +60,7 @@ import "protos/perfetto/config/system_info/system_info_config.proto";
 import "protos/perfetto/config/chrome/histogram_samples.proto";
 
 // The configuration that is passed to each data source when starting tracing.
-// Next id: 138
+// Next id: 139
 message DataSourceConfig {
   enum SessionInitiator {
     SESSION_INITIATOR_UNSPECIFIED = 0;
@@ -259,6 +260,9 @@ message DataSourceConfig {
   // Data source name: android.cpu_per_uid
   optional CpuPerUidConfig cpu_per_uid_config = 137 [lazy = true];
 
+  // Data source name: android.user_list
+  optional UserListConfig user_list_config = 138 [lazy = true];
+
   // This is a fallback mechanism to send a free-form text config to the
   // producer. In theory this should never be needed. All the code that
   // is part of the platform (i.e. traced service) is supposed to *not* truncate