Merge branch 'main' of github.com:google/perfetto into dev/etiennep/state_proto_changes

etiennep-chromium · etiennep-chromium · commit e96ff2c43dd4 · 2026-06-01T11:53:53.000Z
diff --git a/Android.bp b/Android.bp
@@ -1058,6 +1058,7 @@ cc_library {
         "perfetto_defaults",
     ],
     cflags: [
+        "-DPERFETTO_FORCE_DISABLE_ZLIB",
         "-DPERFETTO_REGEX_FORCE_STD",
         "-DPERFETTO_SHLIB_SDK_IMPLEMENTATION",
         "-DZLIB_IMPLEMENTATION",
@@ -1067,7 +1068,6 @@ cc_library {
         android: {
             shared_libs: [
                 "liblog",
-                "libz",
             ],
             static_libs: [
                 "perfetto_flags_c_lib",
@@ -1076,7 +1076,6 @@ cc_library {
         host: {
             static_libs: [
                 "liblog",
-                "libz",
             ],
         },
         windows: {
@@ -1362,6 +1361,7 @@ cc_library_static {
         "perfetto_defaults",
     ],
     cflags: [
+        "-DPERFETTO_FORCE_DISABLE_ZLIB",
         "-DPERFETTO_REGEX_FORCE_STD",
         "-DZLIB_IMPLEMENTATION",
     ],
@@ -1372,18 +1372,10 @@ cc_library_static {
     min_sdk_version: "30",
     target: {
         android: {
-            shared_libs: [
-                "libz",
-            ],
             static_libs: [
                 "perfetto_flags_c_lib",
             ],
         },
-        host: {
-            static_libs: [
-                "libz",
-            ],
-        },
     },
 }
 
@@ -2224,18 +2216,10 @@ cc_library_static {
     ],
     target: {
         android: {
-            shared_libs: [
-                "libz",
-            ],
             static_libs: [
                 "perfetto_flags_c_lib",
             ],
         },
-        host: {
-            static_libs: [
-                "libz",
-            ],
-        },
     },
 }
 
@@ -3495,18 +3479,10 @@ cc_test {
     test_config: "PerfettoIntegrationTests.xml",
     target: {
         android: {
-            shared_libs: [
-                "libz",
-            ],
             static_libs: [
                 "perfetto_flags_c_lib",
             ],
         },
-        host: {
-            static_libs: [
-                "libz",
-            ],
-        },
     },
 }
 
diff --git a/include/perfetto/base/build_config.h b/include/perfetto/base/build_config.h
@@ -238,20 +238,30 @@
 #endif
 #endif
 
-#undef PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ZLIB
-#if defined(PERFETTO_SDK_ENABLE_ZLIB) && (PERFETTO_SDK_ENABLE_ZLIB == 1)
-#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ZLIB() 1
-#else
-#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ZLIB() 0
-#endif
-
 #undef PERFETTO_BUILDFLAG_DEFINE_PERFETTO_RE2
 #if defined(PERFETTO_SDK_ENABLE_RE2) && (PERFETTO_SDK_ENABLE_RE2 == 1)
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_RE2() 1
 #else
 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_RE2() 0
 #endif
 
+#undef PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ZLIB
+#if defined(PERFETTO_SDK_ENABLE_ZLIB) && (PERFETTO_SDK_ENABLE_ZLIB == 1)
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ZLIB() 1
+#else
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ZLIB() 0
+#endif
+
 #endif  // PERFETTO_BUILDFLAG(PERFETTO_AMALGAMATED_SDK)
 
+// Unlike PERFETTO_SDK_ENABLE_ZLIB above (amalgamated SDK opt-in), this is a
+// file-scope opt-out that applies to every build. Define it to compile out the
+// optional zlib compressor. Static libs like libperfetto_client_experimental
+// get linked into many binaries, so keeping the compressor out means those
+// binaries don't have to link libz. See tools/gen_android_bp.
+#if defined(PERFETTO_FORCE_DISABLE_ZLIB)
+#undef PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ZLIB
+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_ZLIB() 0
+#endif
+
 #endif  // INCLUDE_PERFETTO_BASE_BUILD_CONFIG_H_
diff --git a/protos/perfetto/config/etw/etw_config.proto b/protos/perfetto/config/etw/etw_config.proto
@@ -32,7 +32,7 @@ message EtwConfig {
   // The kernel_flags determines the flags that will be used by the etw tracing
   // session. These kernel flags have been built to expose the useful events
   // captured from the kernel mode only.
-  repeated KernelFlag kernel_flags = 1;
+  repeated KernelFlag kernel_flags = 1 [deprecated = true];
 
   // See the list of keywords for for individual providers.
   // https://learn.microsoft.com/en-us/windows/win32/etw/system-providers
@@ -44,7 +44,10 @@ message EtwConfig {
   // Provides events relating to file I/O.
   repeated string file_provider_events = 4;
   // Events for which stacks should be collected.
-  repeated string stack_sampling_events = 5;
+  repeated string stack_sampling_events = 5 [deprecated = true];
   // Provides events relating to disk I/O.
-  repeated string disk_provider_events = 6;
+  repeated string disk_provider_events = 6 [deprecated = true];
+  // Provides events relating to multiple kinds of IO including disk, cache, and
+  // network.
+  repeated string system_io_provider_events = 7;
 }
diff --git a/protos/perfetto/config/perfetto_config.proto b/protos/perfetto/config/perfetto_config.proto
@@ -1384,7 +1384,7 @@ message EtwConfig {
   // The kernel_flags determines the flags that will be used by the etw tracing
   // session. These kernel flags have been built to expose the useful events
   // captured from the kernel mode only.
-  repeated KernelFlag kernel_flags = 1;
+  repeated KernelFlag kernel_flags = 1 [deprecated = true];
 
   // See the list of keywords for for individual providers.
   // https://learn.microsoft.com/en-us/windows/win32/etw/system-providers
@@ -1396,9 +1396,12 @@ message EtwConfig {
   // Provides events relating to file I/O.
   repeated string file_provider_events = 4;
   // Events for which stacks should be collected.
-  repeated string stack_sampling_events = 5;
+  repeated string stack_sampling_events = 5 [deprecated = true];
   // Provides events relating to disk I/O.
-  repeated string disk_provider_events = 6;
+  repeated string disk_provider_events = 6 [deprecated = true];
+  // Provides events relating to multiple kinds of IO including disk, cache, and
+  // network.
+  repeated string system_io_provider_events = 7;
 }
 
 // End of protos/perfetto/config/etw/etw_config.proto
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
@@ -1384,7 +1384,7 @@ message EtwConfig {
   // The kernel_flags determines the flags that will be used by the etw tracing
   // session. These kernel flags have been built to expose the useful events
   // captured from the kernel mode only.
-  repeated KernelFlag kernel_flags = 1;
+  repeated KernelFlag kernel_flags = 1 [deprecated = true];
 
   // See the list of keywords for for individual providers.
   // https://learn.microsoft.com/en-us/windows/win32/etw/system-providers
@@ -1396,9 +1396,12 @@ message EtwConfig {
   // Provides events relating to file I/O.
   repeated string file_provider_events = 4;
   // Events for which stacks should be collected.
-  repeated string stack_sampling_events = 5;
+  repeated string stack_sampling_events = 5 [deprecated = true];
   // Provides events relating to disk I/O.
-  repeated string disk_provider_events = 6;
+  repeated string disk_provider_events = 6 [deprecated = true];
+  // Provides events relating to multiple kinds of IO including disk, cache, and
+  // network.
+  repeated string system_io_provider_events = 7;
 }
 
 // End of protos/perfetto/config/etw/etw_config.proto
@@ -17326,6 +17329,8 @@ message ArtProcessMetadata {
   optional uint64 oom_free_bytes_until_oom = 7;
   // Stacktrace for the thread doing the failing allocation
   optional JavaStack oom_thread_java_stack = 8;
+  // Full OOME exception message
+  optional string oom_error_msg = 9;
 }
 
 // End of protos/perfetto/trace/profiling/art_process_metadata.proto
diff --git a/protos/perfetto/trace/profiling/art_process_metadata.proto b/protos/perfetto/trace/profiling/art_process_metadata.proto
@@ -45,4 +45,6 @@ message ArtProcessMetadata {
   optional uint64 oom_free_bytes_until_oom = 7;
   // Stacktrace for the thread doing the failing allocation
   optional JavaStack oom_thread_java_stack = 8;
+  // Full OOME exception message
+  optional string oom_error_msg = 9;
 }
diff --git a/python/perfetto/protos/perfetto/trace/perfetto_trace_pb2.py b/python/perfetto/protos/perfetto/trace/perfetto_trace_pb2.py
diff --git a/python/perfetto/protos/perfetto/trace/perfetto_trace_pb2.pyi b/python/perfetto/protos/perfetto/trace/perfetto_trace_pb2.pyi
@@ -3757,7 +3757,7 @@ class V8Config(_message.Message):
     def __init__(self, log_script_sources: bool = ..., log_instructions: bool = ...) -> None: ...
 
 class EtwConfig(_message.Message):
-    __slots__ = ("kernel_flags", "scheduler_provider_events", "memory_provider_events", "file_provider_events", "stack_sampling_events", "disk_provider_events")
+    __slots__ = ("kernel_flags", "scheduler_provider_events", "memory_provider_events", "file_provider_events", "stack_sampling_events", "disk_provider_events", "system_io_provider_events")
     class KernelFlag(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
         __slots__ = ()
         CSWITCH: _ClassVar[EtwConfig.KernelFlag]
@@ -3770,13 +3770,15 @@ class EtwConfig(_message.Message):
     FILE_PROVIDER_EVENTS_FIELD_NUMBER: _ClassVar[int]
     STACK_SAMPLING_EVENTS_FIELD_NUMBER: _ClassVar[int]
     DISK_PROVIDER_EVENTS_FIELD_NUMBER: _ClassVar[int]
+    SYSTEM_IO_PROVIDER_EVENTS_FIELD_NUMBER: _ClassVar[int]
     kernel_flags: _containers.RepeatedScalarFieldContainer[EtwConfig.KernelFlag]
     scheduler_provider_events: _containers.RepeatedScalarFieldContainer[str]
     memory_provider_events: _containers.RepeatedScalarFieldContainer[str]
     file_provider_events: _containers.RepeatedScalarFieldContainer[str]
     stack_sampling_events: _containers.RepeatedScalarFieldContainer[str]
     disk_provider_events: _containers.RepeatedScalarFieldContainer[str]
-    def __init__(self, kernel_flags: _Optional[_Iterable[_Union[EtwConfig.KernelFlag, str]]] = ..., scheduler_provider_events: _Optional[_Iterable[str]] = ..., memory_provider_events: _Optional[_Iterable[str]] = ..., file_provider_events: _Optional[_Iterable[str]] = ..., stack_sampling_events: _Optional[_Iterable[str]] = ..., disk_provider_events: _Optional[_Iterable[str]] = ...) -> None: ...
+    system_io_provider_events: _containers.RepeatedScalarFieldContainer[str]
+    def __init__(self, kernel_flags: _Optional[_Iterable[_Union[EtwConfig.KernelFlag, str]]] = ..., scheduler_provider_events: _Optional[_Iterable[str]] = ..., memory_provider_events: _Optional[_Iterable[str]] = ..., file_provider_events: _Optional[_Iterable[str]] = ..., stack_sampling_events: _Optional[_Iterable[str]] = ..., disk_provider_events: _Optional[_Iterable[str]] = ..., system_io_provider_events: _Optional[_Iterable[str]] = ...) -> None: ...
 
 class FrozenFtraceConfig(_message.Message):
     __slots__ = ("instance_name",)
@@ -19494,7 +19496,7 @@ class JavaStack(_message.Message):
     def __init__(self, frames: _Optional[_Iterable[_Union[JavaFrame, _Mapping]]] = ...) -> None: ...
 
 class ArtProcessMetadata(_message.Message):
-    __slots__ = ("pid", "uid", "process_name", "package_name", "oom_allocation_size", "oom_total_bytes_free", "oom_free_bytes_until_oom", "oom_thread_java_stack")
+    __slots__ = ("pid", "uid", "process_name", "package_name", "oom_allocation_size", "oom_total_bytes_free", "oom_free_bytes_until_oom", "oom_thread_java_stack", "oom_error_msg")
     PID_FIELD_NUMBER: _ClassVar[int]
     UID_FIELD_NUMBER: _ClassVar[int]
     PROCESS_NAME_FIELD_NUMBER: _ClassVar[int]
@@ -19503,6 +19505,7 @@ class ArtProcessMetadata(_message.Message):
     OOM_TOTAL_BYTES_FREE_FIELD_NUMBER: _ClassVar[int]
     OOM_FREE_BYTES_UNTIL_OOM_FIELD_NUMBER: _ClassVar[int]
     OOM_THREAD_JAVA_STACK_FIELD_NUMBER: _ClassVar[int]
+    OOM_ERROR_MSG_FIELD_NUMBER: _ClassVar[int]
     pid: int
     uid: int
     process_name: str
@@ -19511,7 +19514,8 @@ class ArtProcessMetadata(_message.Message):
     oom_total_bytes_free: int
     oom_free_bytes_until_oom: int
     oom_thread_java_stack: JavaStack
-    def __init__(self, pid: _Optional[int] = ..., uid: _Optional[int] = ..., process_name: _Optional[str] = ..., package_name: _Optional[str] = ..., oom_allocation_size: _Optional[int] = ..., oom_total_bytes_free: _Optional[int] = ..., oom_free_bytes_until_oom: _Optional[int] = ..., oom_thread_java_stack: _Optional[_Union[JavaStack, _Mapping]] = ...) -> None: ...
+    oom_error_msg: str
+    def __init__(self, pid: _Optional[int] = ..., uid: _Optional[int] = ..., process_name: _Optional[str] = ..., package_name: _Optional[str] = ..., oom_allocation_size: _Optional[int] = ..., oom_total_bytes_free: _Optional[int] = ..., oom_free_bytes_until_oom: _Optional[int] = ..., oom_thread_java_stack: _Optional[_Union[JavaStack, _Mapping]] = ..., oom_error_msg: _Optional[str] = ...) -> None: ...
 
 class ObfuscatedMember(_message.Message):
     __slots__ = ("obfuscated_name", "deobfuscated_name", "obfuscated_line_start", "obfuscated_line_end", "source_line_start", "source_line_end")
diff --git a/src/base/regex/regex_pcre2.h b/src/base/regex/regex_pcre2.h
@@ -19,8 +19,10 @@
 
 #include "perfetto/base/build_config.h"
 
-// See note in regex_re2.h.
-#if PERFETTO_BUILDFLAG(PERFETTO_PCRE2)
+// See note in regex_re2.h. Also honor PERFETTO_REGEX_FORCE_STD: targets that
+// define it (e.g. libperfetto_client_experimental) opt out of the optional
+// backends and must not pull in <pcre2.h>, even when PERFETTO_PCRE2 is set.
+#if PERFETTO_BUILDFLAG(PERFETTO_PCRE2) && !defined(PERFETTO_REGEX_FORCE_STD)
 
 #include <limits>
 #include <memory>
@@ -198,6 +200,7 @@ class RegexPcre2 {
 }  // namespace base
 }  // namespace perfetto
 
-#endif  // PERFETTO_BUILDFLAG(PERFETTO_PCRE2)
+#endif  // PERFETTO_BUILDFLAG(PERFETTO_PCRE2) &&
+        // !defined(PERFETTO_REGEX_FORCE_STD)
 
 #endif  // SRC_BASE_REGEX_REGEX_PCRE2_H_
diff --git a/src/base/regex/regex_re2.h b/src/base/regex/regex_re2.h
@@ -20,8 +20,10 @@
 #include "perfetto/base/build_config.h"
 
 // Guarded because gen_amalgamated inlines the body even when the include
-// site in regex.cc is preprocessed out.
-#if PERFETTO_BUILDFLAG(PERFETTO_RE2)
+// site in regex.cc is preprocessed out. Also honor PERFETTO_REGEX_FORCE_STD:
+// targets that define it opt out of the optional backends and must not pull in
+// <re2/re2.h>, even when PERFETTO_RE2 is set.
+#if PERFETTO_BUILDFLAG(PERFETTO_RE2) && !defined(PERFETTO_REGEX_FORCE_STD)
 
 #include <memory>
 #include <string>
@@ -124,6 +126,7 @@ class RegexRe2 {
 }  // namespace base
 }  // namespace perfetto
 
-#endif  // PERFETTO_BUILDFLAG(PERFETTO_RE2)
+#endif  // PERFETTO_BUILDFLAG(PERFETTO_RE2) &&
+        // !defined(PERFETTO_REGEX_FORCE_STD)
 
 #endif  // SRC_BASE_REGEX_REGEX_RE2_H_
diff --git a/src/protozero/test/example_proto/test_messages.proto b/src/protozero/test/example_proto/test_messages.proto
@@ -18,7 +18,7 @@ syntax = "proto2";
 
 package protozero.test.protos;
 
-import "src/protozero/test/example_proto/extensions.proto";
+import public "src/protozero/test/example_proto/extensions.proto";
 import "src/protozero/test/example_proto/library.proto";
 import "src/protozero/test/example_proto/other_package/test_messages.proto";
 import "src/protozero/test/example_proto/subpackage/test_messages.proto";
diff --git a/src/shared_lib/test/protos/test_messages.pzc.h b/src/shared_lib/test/protos/test_messages.pzc.h
@@ -24,6 +24,7 @@
 #include <stdint.h>
 
 #include "perfetto/public/pb_macros.h"
+#include "src/shared_lib/test/protos/extensions.pzc.h"
 #include "src/shared_lib/test/protos/library.pzc.h"
 #include "src/shared_lib/test/protos/other_package/test_messages.pzc.h"
 #include "src/shared_lib/test/protos/subpackage/test_messages.pzc.h"
diff --git a/src/trace_processor/importers/ftrace/ftrace_parser.cc b/src/trace_processor/importers/ftrace/ftrace_parser.cc
@@ -3445,8 +3445,11 @@ void FtraceParser::ParseInetSockSetState(int64_t timestamp,
     return;
   }
 
-  // Skip invalid TCP state.
-  if (evt.newstate() >= TCP_MAX_STATES || evt.oldstate() >= TCP_MAX_STATES) {
+  // Skip invalid TCP state. Note: newstate()/oldstate() are signed, so we must
+  // also reject negative values to avoid an out-of-bounds read into
+  // kTcpStateNames below.
+  if (evt.newstate() < 0 || evt.newstate() >= TCP_MAX_STATES ||
+      evt.oldstate() < 0 || evt.oldstate() >= TCP_MAX_STATES) {
     PERFETTO_ELOG("skip invalid tcp state");
     return;
   }
diff --git a/src/trace_processor/perfetto_sql/stdlib/prelude/after_eof/counters.sql b/src/trace_processor/perfetto_sql/stdlib/prelude/after_eof/counters.sql
@@ -56,7 +56,7 @@ AS
 SELECT
   id,
   name,
-  NULL AS parent_id,
+  parent_id,
   type,
   dimension_arg_set_id,
   source_arg_set_id,
diff --git a/src/trace_processor/plugins/interval_intersect/interval_intersect.cc b/src/trace_processor/plugins/interval_intersect/interval_intersect.cc
@@ -303,6 +303,23 @@ struct IntervalIntersect : public sqlite::Function<IntervalIntersect> {
     Partitions* p_values = &tables[0]->partitions_map;
     SQLITE_ASSIGN_OR_RETURN(ctx, std::vector<ColType> p_types,
                             GetPartitionsSqlType(*p_values));
+
+    // The caller names the partition columns via the `partition_list` argument
+    // (these were appended to `ret_col_names` above), while the *count* and
+    // types of the partition columns are derived from the input table
+    // (`p_types`). These must agree: `builder` is sized from `ret_col_names`,
+    // but the partition-push loop in PushPartition() indexes the builder using
+    // the number of partition columns present in the data. If they differ, the
+    // push would write out of bounds (the size check inside the builder is only
+    // a DCHECK, compiled out in release builds). This is a single O(1) check,
+    // so it adds no cost to the per-row hot path.
+    if (ret_col_names.size() - kPartitionColsOffset != p_types.size()) {
+      return sqlite::result::Error(
+          ctx,
+          "interval intersect: the number of partition columns in the "
+          "partition list does not match the number of partition columns in "
+          "the input table");
+    }
     col_types.insert(col_types.end(), p_types.begin(), p_types.end());
 
     // Partitions will be taken from the table which has the least number of
diff --git a/test/data/ui-screenshots/queries.test.ts/query-page/query-limit-1.png.sha256 b/test/data/ui-screenshots/queries.test.ts/query-page/query-limit-1.png.sha256
@@ -1 +1 @@
-9ecc5c5836170426d9c356eb125962ba4ed2578e98a0b38e57285ec99957c826
+b83cc3cc82a1d2f4017670559869de77717ffd045879fc0b4c1108dc7580d38b
diff --git a/test/data/ui-screenshots/queries.test.ts/query-page/query-limit-2.png.sha256 b/test/data/ui-screenshots/queries.test.ts/query-page/query-limit-2.png.sha256
@@ -1 +1 @@
-f31be5a32e64e25c11b959f20324a6d659531085975d21197fd924edf4957e6c
+a8371ceb6be1297b3a1ebd2262349f1953ed21cf516c3b0d522361a5c4d73c26
diff --git a/test/data/ui-screenshots/queries.test.ts/query-page/query-limit-3.png.sha256 b/test/data/ui-screenshots/queries.test.ts/query-page/query-limit-3.png.sha256
@@ -1 +1 @@
-2e3dd6ddc6a5efe6975a1d8ef99af56b3c4098e8f216ebe391ea5d4a4e7b3d3f
+54ac8885cdbfb0c8e2b1522b328d2fc407eb3f99f57032df46b0f508c71b81bf
diff --git a/test/trace_processor/diff_tests/stdlib/counters/tests.py b/test/trace_processor/diff_tests/stdlib/counters/tests.py
diff --git a/tools/gen_android_bp b/tools/gen_android_bp
diff --git a/ui/build.mjs b/ui/build.mjs
diff --git a/ui/src/plugins/dev.perfetto.QueryPage/index.ts b/ui/src/plugins/dev.perfetto.QueryPage/index.ts
diff --git a/ui/src/plugins/dev.perfetto.QueryPage/query_page.scss b/ui/src/plugins/dev.perfetto.QueryPage/query_page.scss
diff --git a/ui/src/plugins/dev.perfetto.QueryPage/query_page.ts b/ui/src/plugins/dev.perfetto.QueryPage/query_page.ts

Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,6 @@ message ArtProcessMetadata {`
`45`	`45`	`optional uint64 oom_free_bytes_until_oom = 7;`
`46`	`46`	`// Stacktrace for the thread doing the failing allocation`
`47`	`47`	`optional JavaStack oom_thread_java_stack = 8;`
	`48`	`+ // Full OOME exception message`
	`49`	`+ optional string oom_error_msg = 9;`
`48`	`50`	`}`