fix tests
diff --git a/src/trace_processor/importers/ftrace/binder_tracker_unittest.cc b/src/trace_processor/importers/ftrace/binder_tracker_unittest.cc index 2a53b21..0d5c104 100644 --- a/src/trace_processor/importers/ftrace/binder_tracker_unittest.cc +++ b/src/trace_processor/importers/ftrace/binder_tracker_unittest.cc
@@ -24,6 +24,7 @@ #include "src/trace_processor/importers/common/event_tracker.h" #include "src/trace_processor/importers/common/flow_tracker.h" #include "src/trace_processor/importers/common/global_args_tracker.h" +#include "src/trace_processor/importers/common/machine_tracker.h" #include "src/trace_processor/importers/common/process_tracker.h" #include "src/trace_processor/importers/common/slice_tracker.h" #include "src/trace_processor/importers/common/slice_translation_table.h" @@ -41,6 +42,8 @@ context.global_context->storage.reset(new TraceStorage()); context.global_context->global_args_tracker.reset( new GlobalArgsTracker(context.global_context->storage.get())); + context.machine_context->machine_tracker = + std::make_unique<MachineTracker>(&context, 0); context.trace_context->args_tracker.reset(new ArgsTracker(&context)); context.trace_context->args_translation_table.reset( new ArgsTranslationTable(context.global_context->storage.get()));
diff --git a/src/trace_processor/importers/ftrace/ftrace_sched_event_tracker_unittest.cc b/src/trace_processor/importers/ftrace/ftrace_sched_event_tracker_unittest.cc index 82f59ac..6bd8b41 100644 --- a/src/trace_processor/importers/ftrace/ftrace_sched_event_tracker_unittest.cc +++ b/src/trace_processor/importers/ftrace/ftrace_sched_event_tracker_unittest.cc
@@ -45,14 +45,14 @@ context.global_context->global_args_tracker = std::make_unique<GlobalArgsTracker>( context.global_context->storage.get()); + context.machine_context->machine_tracker = + std::make_unique<MachineTracker>(&context, 0); context.trace_context->args_tracker = std::make_unique<ArgsTracker>(&context); context.trace_context->event_tracker = std::make_unique<EventTracker>(&context); context.machine_context->process_tracker = std::make_unique<ProcessTracker>(&context); - context.machine_context->machine_tracker = - std::make_unique<MachineTracker>(&context, 0); context.machine_context->cpu_tracker = std::make_unique<CpuTracker>(&context); context.machine_context->sched_event_tracker =
diff --git a/src/trace_processor/importers/proto/heap_graph_tracker_unittest.cc b/src/trace_processor/importers/proto/heap_graph_tracker_unittest.cc index ee1fa91..89a3b83 100644 --- a/src/trace_processor/importers/proto/heap_graph_tracker_unittest.cc +++ b/src/trace_processor/importers/proto/heap_graph_tracker_unittest.cc
@@ -26,6 +26,7 @@ #include "perfetto/ext/base/string_view.h" #include "protos/perfetto/trace/profiling/heap_graph.pbzero.h" #include "src/trace_processor/containers/string_pool.h" +#include "src/trace_processor/importers/common/machine_tracker.h" #include "src/trace_processor/importers/common/process_tracker.h" #include "src/trace_processor/storage/trace_storage.h" #include "src/trace_processor/tables/profiler_tables_py.h" @@ -72,6 +73,8 @@ TraceProcessorContext context; context.global_context->storage = std::make_shared<TraceStorage>(); + context.machine_context->machine_tracker = + std::make_unique<MachineTracker>(&context, 0); context.machine_context->process_tracker = std::make_unique<ProcessTracker>(&context); context.machine_context->process_tracker->GetOrCreateProcess(kPid); @@ -218,6 +221,8 @@ TraceProcessorContext context; context.global_context->storage.reset(new TraceStorage()); + context.machine_context->machine_tracker.reset( + new MachineTracker(&context, 0)); context.machine_context->process_tracker.reset(new ProcessTracker(&context)); context.machine_context->process_tracker->GetOrCreateProcess(kPid); @@ -347,6 +352,8 @@ TraceProcessorContext context; context.global_context->storage.reset(new TraceStorage()); + context.machine_context->machine_tracker.reset( + new MachineTracker(&context, 0)); context.machine_context->process_tracker.reset(new ProcessTracker(&context)); context.machine_context->process_tracker->GetOrCreateProcess(kPid);
diff --git a/src/trace_processor/importers/proto/jit_tracker_unittest.cc b/src/trace_processor/importers/proto/jit_tracker_unittest.cc index 9555853..e4704cf 100644 --- a/src/trace_processor/importers/proto/jit_tracker_unittest.cc +++ b/src/trace_processor/importers/proto/jit_tracker_unittest.cc
@@ -24,6 +24,7 @@ #include "perfetto/trace_processor/trace_blob_view.h" #include "src/trace_processor/importers/common/address_range.h" #include "src/trace_processor/importers/common/jit_cache.h" +#include "src/trace_processor/importers/common/machine_tracker.h" #include "src/trace_processor/importers/common/mapping_tracker.h" #include "src/trace_processor/importers/common/process_tracker.h" #include "src/trace_processor/importers/common/stack_profile_tracker.h" @@ -50,6 +51,8 @@ public: JitTrackerTest() : jit_tracker_(&context_) { context_.global_context->storage.reset(new TraceStorage()); + context_.machine_context->machine_tracker.reset( + new MachineTracker(&context_, 0)); context_.trace_context->stack_profile_tracker.reset( new StackProfileTracker(&context_)); context_.machine_context->mapping_tracker.reset(
diff --git a/src/trace_processor/importers/proto/network_trace_module_unittest.cc b/src/trace_processor/importers/proto/network_trace_module_unittest.cc index 55519dc..7cedf5f 100644 --- a/src/trace_processor/importers/proto/network_trace_module_unittest.cc +++ b/src/trace_processor/importers/proto/network_trace_module_unittest.cc
@@ -33,6 +33,7 @@ #include "src/trace_processor/importers/common/args_tracker.h" #include "src/trace_processor/importers/common/args_translation_table.h" #include "src/trace_processor/importers/common/global_args_tracker.h" +#include "src/trace_processor/importers/common/machine_tracker.h" #include "src/trace_processor/importers/common/process_track_translation_table.h" #include "src/trace_processor/importers/common/slice_tracker.h" #include "src/trace_processor/importers/common/slice_translation_table.h" @@ -64,6 +65,8 @@ context_.global_context->storage = std::make_shared<TraceStorage>(); storage_ = context_.global_context->storage.get(); storage_ = context_.global_context->storage.get(); + context_.machine_context->machine_tracker = + std::make_unique<MachineTracker>(&context_, 0); context_.machine_context->track_tracker = std::make_unique<TrackTracker>(&context_); context_.trace_context->slice_tracker =
diff --git a/src/trace_processor/importers/syscalls/syscall_tracker_unittest.cc b/src/trace_processor/importers/syscalls/syscall_tracker_unittest.cc index 92cdac5..ded9b86 100644 --- a/src/trace_processor/importers/syscalls/syscall_tracker_unittest.cc +++ b/src/trace_processor/importers/syscalls/syscall_tracker_unittest.cc
@@ -17,6 +17,7 @@ #include "src/trace_processor/importers/syscalls/syscall_tracker.h" #include "src/trace_processor/importers/common/global_args_tracker.h" +#include "src/trace_processor/importers/common/machine_tracker.h" #include "src/trace_processor/importers/common/slice_tracker.h" #include "test/gtest_and_gmock.h" @@ -67,6 +68,8 @@ context.global_context->storage.reset(new TraceStorage()); context.global_context->global_args_tracker.reset( new GlobalArgsTracker(context.global_context->storage.get())); + context.machine_context->machine_tracker.reset( + new MachineTracker(&context, 0)); track_tracker = new TrackTracker(&context); context.machine_context->track_tracker.reset(track_tracker); slice_tracker = new MockSliceTracker(&context);