trace_processor: Introduce Desctructible base class for trackers
This is a preparation step before moving some modules from storage_minimal
to storage_full.
Bug: 141459049
Change-Id: I62b88fa617d59c8d2aaa78e7cdeec59bd2245533
diff --git a/Android.bp b/Android.bp
index 7a622db..cddb354 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5754,6 +5754,7 @@
"src/trace_processor/args_tracker.cc",
"src/trace_processor/binder_tracker.cc",
"src/trace_processor/clock_tracker.cc",
+ "src/trace_processor/destructible.cc",
"src/trace_processor/event_tracker.cc",
"src/trace_processor/forwarding_trace_parser.cc",
"src/trace_processor/ftrace_utils.cc",
diff --git a/BUILD b/BUILD
index 1dde88e..4ecf967 100644
--- a/BUILD
+++ b/BUILD
@@ -797,6 +797,8 @@
"src/trace_processor/chunked_trace_reader.h",
"src/trace_processor/clock_tracker.cc",
"src/trace_processor/clock_tracker.h",
+ "src/trace_processor/destructible.cc",
+ "src/trace_processor/destructible.h",
"src/trace_processor/event_tracker.cc",
"src/trace_processor/event_tracker.h",
"src/trace_processor/forwarding_trace_parser.cc",
diff --git a/src/trace_processor/BUILD.gn b/src/trace_processor/BUILD.gn
index df2329f..3b3f7bb 100644
--- a/src/trace_processor/BUILD.gn
+++ b/src/trace_processor/BUILD.gn
@@ -83,6 +83,8 @@
"chunked_trace_reader.h",
"clock_tracker.cc",
"clock_tracker.h",
+ "destructible.cc",
+ "destructible.h",
"event_tracker.cc",
"event_tracker.h",
"forwarding_trace_parser.cc",
@@ -270,6 +272,20 @@
if (enable_perfetto_trace_processor_json) {
public_deps += [ "../../gn:jsoncpp" ]
}
+
+ # Include these sources only if they are not already included in
+ # storage_minimal.
+ # TODO(khokhlov): Remove this 'if' when modules that use this tracker are
+ # migrated to storage_full.
+ if (!enable_perfetto_trace_processor_syscalls) {
+ sources += [
+ "syscall_tracker.cc",
+ "syscalls_aarch32.h",
+ "syscalls_aarch64.h",
+ "syscalls_armeabi.h",
+ "syscalls_x86_64.h",
+ ]
+ }
}
if (enable_perfetto_trace_processor_json) {
diff --git a/src/trace_processor/destructible.cc b/src/trace_processor/destructible.cc
new file mode 100644
index 0000000..22bcf6a
--- /dev/null
+++ b/src/trace_processor/destructible.cc
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2019 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
+ *
+ * http://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.
+ */
+#include "src/trace_processor/destructible.h"
+
+namespace perfetto {
+namespace trace_processor {
+
+Destructible::~Destructible() = default;
+
+} // namespace trace_processor
+} // namespace perfetto
diff --git a/src/trace_processor/destructible.h b/src/trace_processor/destructible.h
new file mode 100644
index 0000000..9b9c20f
--- /dev/null
+++ b/src/trace_processor/destructible.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2019 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
+ *
+ * http://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.
+ */
+
+#ifndef SRC_TRACE_PROCESSOR_DESTRUCTIBLE_H_
+#define SRC_TRACE_PROCESSOR_DESTRUCTIBLE_H_
+
+namespace perfetto {
+namespace trace_processor {
+
+// To reduce Chrome binary size, we exclude the source code of several
+// trackers from the storage_minimal build target. So the trace processor
+// context can't always know the exact types of the tracker classes, but
+// it still needs to destruct them. To solve this, we subclass all trackers
+// from this Desctructible class.
+class Destructible {
+ public:
+ virtual ~Destructible();
+};
+
+} // namespace trace_processor
+} // namespace perfetto
+
+#endif // SRC_TRACE_PROCESSOR_DESTRUCTIBLE_H_
diff --git a/src/trace_processor/importers/ftrace/ftrace_parser.cc b/src/trace_processor/importers/ftrace/ftrace_parser.cc
index c07fd8d..d5e68ef 100644
--- a/src/trace_processor/importers/ftrace/ftrace_parser.cc
+++ b/src/trace_processor/importers/ftrace/ftrace_parser.cc
@@ -707,10 +707,11 @@
uint32_t syscall_num = static_cast<uint32_t>(evt.id());
UniqueTid utid = context_->process_tracker->GetOrCreateThread(pid);
+ SyscallTracker* syscall_tracker = SyscallTracker::GetOrCreate(context_);
if (is_enter) {
- context_->syscall_tracker->Enter(ts, utid, syscall_num);
+ syscall_tracker->Enter(ts, utid, syscall_num);
} else {
- context_->syscall_tracker->Exit(ts, utid, syscall_num);
+ syscall_tracker->Exit(ts, utid, syscall_num);
}
// We are reusing the same function for sys_enter and sys_exit.
diff --git a/src/trace_processor/importers/proto/system_probes_parser.cc b/src/trace_processor/importers/proto/system_probes_parser.cc
index 8fb1281..5beed38 100644
--- a/src/trace_processor/importers/proto/system_probes_parser.cc
+++ b/src/trace_processor/importers/proto/system_probes_parser.cc
@@ -290,10 +290,11 @@
protos::pbzero::Utsname::Decoder utsname(utsname_blob.data,
utsname_blob.size);
base::StringView machine = utsname.machine();
+ SyscallTracker* syscall_tracker = SyscallTracker::GetOrCreate(context_);
if (machine == "aarch64" || machine == "armv8l") {
- context_->syscall_tracker->SetArchitecture(kAarch64);
+ syscall_tracker->SetArchitecture(kAarch64);
} else if (machine == "x86_64") {
- context_->syscall_tracker->SetArchitecture(kX86_64);
+ syscall_tracker->SetArchitecture(kX86_64);
} else {
PERFETTO_ELOG("Unknown architecture %s", machine.ToStdString().c_str());
}
diff --git a/src/trace_processor/syscall_tracker.h b/src/trace_processor/syscall_tracker.h
index 09cf772..31e39e1 100644
--- a/src/trace_processor/syscall_tracker.h
+++ b/src/trace_processor/syscall_tracker.h
@@ -21,6 +21,7 @@
#include <tuple>
#include "perfetto/ext/base/string_view.h"
+#include "src/trace_processor/destructible.h"
#include "src/trace_processor/slice_tracker.h"
#include "src/trace_processor/trace_processor_context.h"
#include "src/trace_processor/trace_storage.h"
@@ -39,12 +40,18 @@
kX86_64,
};
-class SyscallTracker {
+class SyscallTracker : public Destructible {
public:
explicit SyscallTracker(TraceProcessorContext*);
SyscallTracker(const SyscallTracker&) = delete;
SyscallTracker& operator=(const SyscallTracker&) = delete;
virtual ~SyscallTracker();
+ static SyscallTracker* GetOrCreate(TraceProcessorContext* context) {
+ if (!context->syscall_tracker) {
+ context->syscall_tracker.reset(new SyscallTracker(context));
+ }
+ return static_cast<SyscallTracker*>(context->syscall_tracker.get());
+ }
void SetArchitecture(Architecture architecture);
diff --git a/src/trace_processor/syscall_tracker_unittest.cc b/src/trace_processor/syscall_tracker_unittest.cc
index a659a64..1d9f513 100644
--- a/src/trace_processor/syscall_tracker_unittest.cc
+++ b/src/trace_processor/syscall_tracker_unittest.cc
@@ -54,7 +54,6 @@
context.track_tracker.reset(track_tracker);
slice_tracker = new MockSliceTracker(&context);
context.slice_tracker.reset(slice_tracker);
- context.syscall_tracker.reset(new SyscallTracker(&context));
}
protected:
@@ -72,19 +71,21 @@
EXPECT_CALL(*slice_tracker, End(110, track, kNullStringId, _, _))
.WillOnce(DoAll(SaveArg<3>(&end_name), Return(base::nullopt)));
- context.syscall_tracker->Enter(100 /*ts*/, 42 /*utid*/, 57 /*sys_read*/);
- context.syscall_tracker->Exit(110 /*ts*/, 42 /*utid*/, 57 /*sys_read*/);
+ SyscallTracker* syscall_tracker = SyscallTracker::GetOrCreate(&context);
+ syscall_tracker->Enter(100 /*ts*/, 42 /*utid*/, 57 /*sys_read*/);
+ syscall_tracker->Exit(110 /*ts*/, 42 /*utid*/, 57 /*sys_read*/);
EXPECT_EQ(context.storage->GetString(begin_name), "sys_57");
EXPECT_EQ(context.storage->GetString(end_name), "sys_57");
}
TEST_F(SyscallTrackerTest, IgnoreWriteSyscalls) {
- context.syscall_tracker->SetArchitecture(kAarch64);
+ SyscallTracker* syscall_tracker = SyscallTracker::GetOrCreate(&context);
+ syscall_tracker->SetArchitecture(kAarch64);
EXPECT_CALL(*slice_tracker, Begin(_, _, _, _, _)).Times(0);
EXPECT_CALL(*slice_tracker, End(_, _, _, _, _)).Times(0);
- context.syscall_tracker->Enter(100 /*ts*/, 42 /*utid*/, 64 /*sys_write*/);
- context.syscall_tracker->Exit(110 /*ts*/, 42 /*utid*/, 64 /*sys_write*/);
+ syscall_tracker->Enter(100 /*ts*/, 42 /*utid*/, 64 /*sys_write*/);
+ syscall_tracker->Exit(110 /*ts*/, 42 /*utid*/, 64 /*sys_write*/);
}
TEST_F(SyscallTrackerTest, Aarch64) {
@@ -96,9 +97,10 @@
EXPECT_CALL(*slice_tracker, End(110, track, kNullStringId, _, _))
.WillOnce(DoAll(SaveArg<3>(&end_name), Return(base::nullopt)));
- context.syscall_tracker->SetArchitecture(kAarch64);
- context.syscall_tracker->Enter(100 /*ts*/, 42 /*utid*/, 63 /*sys_read*/);
- context.syscall_tracker->Exit(110 /*ts*/, 42 /*utid*/, 63 /*sys_read*/);
+ SyscallTracker* syscall_tracker = SyscallTracker::GetOrCreate(&context);
+ syscall_tracker->SetArchitecture(kAarch64);
+ syscall_tracker->Enter(100 /*ts*/, 42 /*utid*/, 63 /*sys_read*/);
+ syscall_tracker->Exit(110 /*ts*/, 42 /*utid*/, 63 /*sys_read*/);
EXPECT_EQ(context.storage->GetString(begin_name), "sys_read");
EXPECT_EQ(context.storage->GetString(end_name), "sys_read");
}
@@ -112,9 +114,10 @@
EXPECT_CALL(*slice_tracker, End(110, track, kNullStringId, _, _))
.WillOnce(DoAll(SaveArg<3>(&end_name), Return(base::nullopt)));
- context.syscall_tracker->SetArchitecture(kX86_64);
- context.syscall_tracker->Enter(100 /*ts*/, 42 /*utid*/, 0 /*sys_read*/);
- context.syscall_tracker->Exit(110 /*ts*/, 42 /*utid*/, 0 /*sys_read*/);
+ SyscallTracker* syscall_tracker = SyscallTracker::GetOrCreate(&context);
+ syscall_tracker->SetArchitecture(kX86_64);
+ syscall_tracker->Enter(100 /*ts*/, 42 /*utid*/, 0 /*sys_read*/);
+ syscall_tracker->Exit(110 /*ts*/, 42 /*utid*/, 0 /*sys_read*/);
EXPECT_EQ(context.storage->GetString(begin_name), "sys_read");
EXPECT_EQ(context.storage->GetString(end_name), "sys_read");
}
@@ -122,9 +125,11 @@
TEST_F(SyscallTrackerTest, SyscallNumberTooLarge) {
EXPECT_CALL(*slice_tracker, Begin(_, _, _, _, _)).Times(0);
EXPECT_CALL(*slice_tracker, End(_, _, _, _, _)).Times(0);
- context.syscall_tracker->SetArchitecture(kAarch64);
- context.syscall_tracker->Enter(100 /*ts*/, 42 /*utid*/, 9999);
- context.syscall_tracker->Exit(110 /*ts*/, 42 /*utid*/, 9999);
+
+ SyscallTracker* syscall_tracker = SyscallTracker::GetOrCreate(&context);
+ syscall_tracker->SetArchitecture(kAarch64);
+ syscall_tracker->Enter(100 /*ts*/, 42 /*utid*/, 9999);
+ syscall_tracker->Exit(110 /*ts*/, 42 /*utid*/, 9999);
}
} // namespace
diff --git a/src/trace_processor/trace_processor_context.cc b/src/trace_processor/trace_processor_context.cc
index a6b1c03..b5667f4 100644
--- a/src/trace_processor/trace_processor_context.cc
+++ b/src/trace_processor/trace_processor_context.cc
@@ -29,13 +29,11 @@
#include "src/trace_processor/importers/proto/heap_graph_module.h"
#include "src/trace_processor/importers/proto/heap_graph_tracker.h"
#include "src/trace_processor/importers/proto/proto_trace_parser.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/process_tracker.h"
#include "src/trace_processor/slice_tracker.h"
#include "src/trace_processor/stack_profile_tracker.h"
-#include "src/trace_processor/syscall_tracker.h"
#include "src/trace_processor/trace_sorter.h"
#include "src/trace_processor/track_tracker.h"
diff --git a/src/trace_processor/trace_processor_context.h b/src/trace_processor/trace_processor_context.h
index 3eab980..9fb7a6a 100644
--- a/src/trace_processor/trace_processor_context.h
+++ b/src/trace_processor/trace_processor_context.h
@@ -21,6 +21,7 @@
#include <vector>
#include "perfetto/trace_processor/basic_types.h"
+#include "src/trace_processor/destructible.h"
#include "src/trace_processor/importers/proto/proto_importer_module.h"
namespace perfetto {
@@ -37,7 +38,6 @@
class ProcessTracker;
class SchedEventTracker;
class SliceTracker;
-class SyscallTracker;
class SystraceParser;
class TraceParser;
class TraceSorter;
@@ -56,7 +56,6 @@
std::unique_ptr<ArgsTracker> args_tracker;
std::unique_ptr<SliceTracker> slice_tracker;
std::unique_ptr<ProcessTracker> process_tracker;
- std::unique_ptr<SyscallTracker> syscall_tracker;
std::unique_ptr<EventTracker> event_tracker;
std::unique_ptr<SchedEventTracker> sched_tracker;
std::unique_ptr<ClockTracker> clock_tracker;
@@ -68,6 +67,13 @@
std::unique_ptr<HeapGraphTracker> heap_graph_tracker;
std::unique_ptr<BinderTracker> binder_tracker;
+ // These fields are stored as pointers to Destructible objects rather than
+ // their actual type (a subclass of Destructible), as the concrete subclass
+ // type is only available in the storage_full target. To access these fields,
+ // use the GetOrCreate() method on their subclass type,
+ // e.g. SyscallTracker::GetOrCreate(context).
+ std::unique_ptr<Destructible> syscall_tracker; // SyscallTracker.
+
// The module at the index N is registered to handle field id N in
// TracePacket.
std::vector<ProtoImporterModule*> modules_by_field;
diff --git a/src/trace_processor/trace_processor_storage_impl.cc b/src/trace_processor/trace_processor_storage_impl.cc
index 2ceb370..15f58a2 100644
--- a/src/trace_processor/trace_processor_storage_impl.cc
+++ b/src/trace_processor/trace_processor_storage_impl.cc
@@ -37,7 +37,6 @@
#include "src/trace_processor/process_tracker.h"
#include "src/trace_processor/slice_tracker.h"
#include "src/trace_processor/stack_profile_tracker.h"
-#include "src/trace_processor/syscall_tracker.h"
#include "src/trace_processor/trace_blob_view.h"
#include "src/trace_processor/trace_sorter.h"
#include "src/trace_processor/track_tracker.h"
@@ -53,9 +52,6 @@
context_.slice_tracker.reset(new SliceTracker(&context_));
context_.event_tracker.reset(new EventTracker(&context_));
context_.process_tracker.reset(new ProcessTracker(&context_));
-#if PERFETTO_BUILDFLAG(PERFETTO_TP_SYSCALLS)
- context_.syscall_tracker.reset(new SyscallTracker(&context_));
-#endif // PERFETTO_BUILDFLAG(PERFETTO_TP_SYSCALLS)
context_.clock_tracker.reset(new ClockTracker(&context_));
context_.heap_profile_tracker.reset(new HeapProfileTracker(&context_));
#if PERFETTO_BUILDFLAG(PERFETTO_TP_FTRACE)