trace_processor: Remove PERFETTO_TP_SYSTEM_PROBES build flag
The system_probes module is moved to storage_full.
Bug: 141459049
Change-Id: Ief74d748ac1089ef88e080e5625c0f8a1f7064e1
diff --git a/Android.bp b/Android.bp
index cddb354..f2abac3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5742,6 +5742,8 @@
srcs: [
"src/trace_processor/importers/proto/graphics_event_module.cc",
"src/trace_processor/importers/proto/graphics_event_parser.cc",
+ "src/trace_processor/importers/proto/system_probes_module.cc",
+ "src/trace_processor/importers/proto/system_probes_parser.cc",
"src/trace_processor/importers/proto/vulkan_memory_tracker.cc",
"src/trace_processor/register_additional_modules.cc",
],
@@ -5779,8 +5781,6 @@
"src/trace_processor/importers/proto/proto_importer_module.cc",
"src/trace_processor/importers/proto/proto_trace_parser.cc",
"src/trace_processor/importers/proto/proto_trace_tokenizer.cc",
- "src/trace_processor/importers/proto/system_probes_module.cc",
- "src/trace_processor/importers/proto/system_probes_parser.cc",
"src/trace_processor/importers/proto/track_event_module.cc",
"src/trace_processor/importers/proto/track_event_parser.cc",
"src/trace_processor/importers/proto/track_event_tokenizer.cc",
diff --git a/BUILD b/BUILD
index 4ecf967..08de559 100644
--- a/BUILD
+++ b/BUILD
@@ -779,6 +779,10 @@
"src/trace_processor/importers/proto/graphics_event_module.h",
"src/trace_processor/importers/proto/graphics_event_parser.cc",
"src/trace_processor/importers/proto/graphics_event_parser.h",
+ "src/trace_processor/importers/proto/system_probes_module.cc",
+ "src/trace_processor/importers/proto/system_probes_module.h",
+ "src/trace_processor/importers/proto/system_probes_parser.cc",
+ "src/trace_processor/importers/proto/system_probes_parser.h",
"src/trace_processor/importers/proto/vulkan_memory_tracker.cc",
"src/trace_processor/importers/proto/vulkan_memory_tracker.h",
"src/trace_processor/register_additional_modules.cc",
@@ -855,10 +859,6 @@
"src/trace_processor/importers/proto/proto_trace_parser.h",
"src/trace_processor/importers/proto/proto_trace_tokenizer.cc",
"src/trace_processor/importers/proto/proto_trace_tokenizer.h",
- "src/trace_processor/importers/proto/system_probes_module.cc",
- "src/trace_processor/importers/proto/system_probes_module.h",
- "src/trace_processor/importers/proto/system_probes_parser.cc",
- "src/trace_processor/importers/proto/system_probes_parser.h",
"src/trace_processor/importers/proto/track_event_module.cc",
"src/trace_processor/importers/proto/track_event_module.h",
"src/trace_processor/importers/proto/track_event_parser.cc",
diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index ab87bc9..0042b64 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -84,7 +84,6 @@
"PERFETTO_TP_METRICS=$enable_perfetto_trace_processor_metrics",
"PERFETTO_TP_FTRACE=$enable_perfetto_trace_processor_ftrace",
"PERFETTO_TP_HTTPD=$perfetto_tp_httpd",
- "PERFETTO_TP_SYSTEM_PROBES=$enable_perfetto_trace_processor_system_probes",
"PERFETTO_TP_ANDROID_PROBES=$enable_perfetto_trace_processor_android_probes",
"PERFETTO_TP_HEAP_GRAPHS=$enable_perfetto_trace_processor_heap_graphs",
"PERFETTO_TP_JSON=$enable_perfetto_trace_processor_json",
diff --git a/gn/perfetto.gni b/gn/perfetto.gni
index 4aba7e1..d488cab 100644
--- a/gn/perfetto.gni
+++ b/gn/perfetto.gni
@@ -219,10 +219,6 @@
enable_perfetto_trace_processor_ftrace =
enable_perfetto_trace_processor && !(build_with_chromium && is_android)
- # Enables parsing support for system probes in trace processor.
- enable_perfetto_trace_processor_system_probes =
- enable_perfetto_trace_processor && !(build_with_chromium && is_android)
-
# Enables parsing support for android system probes in trace processor.
enable_perfetto_trace_processor_android_probes =
enable_perfetto_trace_processor && !(build_with_chromium && is_android)
@@ -257,7 +253,6 @@
# probes, and android probes support.
enable_perfetto_trace_processor_syscalls =
enable_perfetto_trace_processor_ftrace ||
- enable_perfetto_trace_processor_system_probes ||
enable_perfetto_trace_processor_android_probes
# Enables metrics support in the trace processor, which require SQL support.
@@ -319,5 +314,4 @@
# Syscall support is required for ftrace, system probes, and android probes.
assert(enable_perfetto_trace_processor_syscalls ||
(!enable_perfetto_trace_processor_ftrace &&
- !enable_perfetto_trace_processor_system_probes &&
!enable_perfetto_trace_processor_android_probes))
diff --git a/include/perfetto/base/build_configs/android_tree/perfetto_build_flags.h b/include/perfetto/base/build_configs/android_tree/perfetto_build_flags.h
index 41c3c05..2e23b4b 100644
--- a/include/perfetto/base/build_configs/android_tree/perfetto_build_flags.h
+++ b/include/perfetto/base/build_configs/android_tree/perfetto_build_flags.h
@@ -38,7 +38,6 @@
#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_METRICS() (1)
#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_FTRACE() (1)
#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_HTTPD() (0)
-#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_SYSTEM_PROBES() (1)
#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_ANDROID_PROBES() (1)
#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_HEAP_GRAPHS() (1)
#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_JSON() (0)
diff --git a/include/perfetto/base/build_configs/bazel/perfetto_build_flags.h b/include/perfetto/base/build_configs/bazel/perfetto_build_flags.h
index 04c4e7d..a43574c 100644
--- a/include/perfetto/base/build_configs/bazel/perfetto_build_flags.h
+++ b/include/perfetto/base/build_configs/bazel/perfetto_build_flags.h
@@ -38,7 +38,6 @@
#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_METRICS() (1)
#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_FTRACE() (1)
#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_HTTPD() (PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() || PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() || PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX())
-#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_SYSTEM_PROBES() (1)
#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_ANDROID_PROBES() (1)
#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_HEAP_GRAPHS() (1)
#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_TP_JSON() (1)
diff --git a/src/trace_processor/BUILD.gn b/src/trace_processor/BUILD.gn
index 3b3f7bb..ee22ca1 100644
--- a/src/trace_processor/BUILD.gn
+++ b/src/trace_processor/BUILD.gn
@@ -117,8 +117,6 @@
"importers/proto/proto_trace_parser.h",
"importers/proto/proto_trace_tokenizer.cc",
"importers/proto/proto_trace_tokenizer.h",
- "importers/proto/system_probes_module.h",
- "importers/proto/system_probes_parser.h",
"importers/proto/track_event_module.cc",
"importers/proto/track_event_module.h",
"importers/proto/track_event_parser.cc",
@@ -205,18 +203,12 @@
enable_perfetto_trace_processor_fuchsia) {
sources += [ "ftrace_utils.cc" ]
}
- if (enable_perfetto_trace_processor_system_probes) {
- sources += [
- "importers/proto/system_probes_module.cc",
- "importers/proto/system_probes_parser.cc",
- ]
- deps += [ "../../include/perfetto/ext/traced:sys_stats_counters" ]
- }
if (enable_perfetto_trace_processor_android_probes) {
sources += [
"importers/proto/android_probes_module.cc",
"importers/proto/android_probes_parser.cc",
]
+ deps += [ "../../include/perfetto/ext/traced:sys_stats_counters" ]
}
if (enable_perfetto_trace_processor_heap_graphs) {
sources += [
@@ -253,6 +245,10 @@
"importers/proto/graphics_event_module.h",
"importers/proto/graphics_event_parser.cc",
"importers/proto/graphics_event_parser.h",
+ "importers/proto/system_probes_module.cc",
+ "importers/proto/system_probes_module.h",
+ "importers/proto/system_probes_parser.cc",
+ "importers/proto/system_probes_parser.h",
"importers/proto/vulkan_memory_tracker.cc",
"importers/proto/vulkan_memory_tracker.h",
"register_additional_modules.cc",
@@ -262,6 +258,7 @@
":storage_minimal",
]
deps = [
+ "../../include/perfetto/ext/traced:sys_stats_counters",
"../../protos/perfetto/common:zero",
"../../protos/perfetto/trace:zero",
"../../protos/perfetto/trace/android:zero",
diff --git a/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc b/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
index 4d9150d..aab449a 100644
--- a/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
+++ b/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
@@ -84,8 +84,6 @@
using ::testing::Return;
using ::testing::UnorderedElementsAreArray;
-#if PERFETTO_BUILDFLAG(PERFETTO_TP_FTRACE) || \
- PERFETTO_BUILDFLAG(PERFETTO_TP_SYSTEM_PROBES)
namespace {
MATCHER_P(DoubleEq, exp, "Double matcher that satisfies -Wfloat-equal") {
// The IEEE standard says that any comparison operation involving
@@ -97,8 +95,6 @@
return fabs(d_arg - d_exp) < 1e-128;
}
} // namespace
-#endif // PERFETTO_BUILDFLAG(PERFETTO_TP_FTRACE) ||
- // PERFETTO_BUILDFLAG(PERFETTO_TP_SYSTEM_PROBES)
#if PERFETTO_BUILDFLAG(PERFETTO_TP_FTRACE)
class MockSchedEventTracker : public SchedEventTracker {
@@ -265,9 +261,6 @@
#if PERFETTO_BUILDFLAG(PERFETTO_TP_ANDROID_PROBES)
context_.modules.emplace_back(new AndroidProbesModule(&context_));
#endif // PERFETTO_BUILDFLAG(PERFETTO_TP_ANDROID_PROBES)
-#if PERFETTO_BUILDFLAG(PERFETTO_TP_SYSTEM_PROBES)
- context_.modules.emplace_back(new SystemProbesModule(&context_));
-#endif // PERFETTO_BUILDFLAG(PERFETTO_TP_SYSTEM_PROBES)
context_.modules.emplace_back(new TrackEventModule(&context_));
RegisterAdditionalModules(&context_);
@@ -611,8 +604,6 @@
#endif // PERFETTO_BUILDFLAG(PERFETTO_TP_FTRACE)
-#if PERFETTO_BUILDFLAG(PERFETTO_TP_SYSTEM_PROBES)
-
TEST_F(ProtoTraceParserTest, LoadMemInfo) {
auto* packet = trace_.add_packet();
uint64_t ts = 1000;
@@ -687,8 +678,6 @@
Tokenize();
}
-#endif // PERFETTO_BUILDFLAG(PERFETTO_TP_SYSTEM_PROBES)
-
TEST_F(ProtoTraceParserTest, ThreadNameFromThreadDescriptor) {
context_.sorter.reset(new TraceSorter(
&context_, std::numeric_limits<int64_t>::max() /*window size*/));
diff --git a/src/trace_processor/register_additional_modules.cc b/src/trace_processor/register_additional_modules.cc
index cb2b68b..55a365b 100644
--- a/src/trace_processor/register_additional_modules.cc
+++ b/src/trace_processor/register_additional_modules.cc
@@ -16,12 +16,14 @@
#include "src/trace_processor/register_additional_modules.h"
#include "src/trace_processor/importers/proto/graphics_event_module.h"
+#include "src/trace_processor/importers/proto/system_probes_module.h"
namespace perfetto {
namespace trace_processor {
void RegisterAdditionalModules(TraceProcessorContext* context) {
context->modules.emplace_back(new GraphicsEventModule(context));
+ context->modules.emplace_back(new SystemProbesModule(context));
}
} // namespace trace_processor
diff --git a/src/trace_processor/trace_processor_storage_impl.cc b/src/trace_processor/trace_processor_storage_impl.cc
index 15f58a2..c7e3ad2 100644
--- a/src/trace_processor/trace_processor_storage_impl.cc
+++ b/src/trace_processor/trace_processor_storage_impl.cc
@@ -30,7 +30,6 @@
#include "src/trace_processor/importers/proto/heap_graph_tracker.h"
#include "src/trace_processor/importers/proto/proto_importer_module.h"
#include "src/trace_processor/importers/proto/proto_trace_tokenizer.h"
-#include "src/trace_processor/importers/proto/system_probes_module.h"
#include "src/trace_processor/importers/proto/track_event_module.h"
#include "src/trace_processor/importers/systrace/systrace_parser.h"
#include "src/trace_processor/importers/systrace/systrace_trace_parser.h"
@@ -76,9 +75,6 @@
#if PERFETTO_BUILDFLAG(PERFETTO_TP_ANDROID_PROBES)
context_.modules.emplace_back(new AndroidProbesModule(&context_));
#endif // PERFETTO_BUILDFLAG(PERFETTO_TP_ANDROID_PROBES)
-#if PERFETTO_BUILDFLAG(PERFETTO_TP_SYSTEM_PROBES)
- context_.modules.emplace_back(new SystemProbesModule(&context_));
-#endif // PERFETTO_BUILDFLAG(PERFETTO_TP_SYSTEM_PROBES)
context_.modules.emplace_back(new TrackEventModule(&context_));
}