commit 569ad3180986e4fc03710a80a8263075622f1f4b
author Primiano Tucci <primiano@google.com> Wed Mar 14 22:28:31 2018 +0000
committer Primiano Tucci <primiano@google.com> Thu Mar 15 07:29:26 2018 +0000
tree 1f281e7c9d51434fdf2fda71484a4be7d7a57a0a
parent 941b221544449997e9323d719b2f04eb3c393a7f

Remove dependency from filesystem to ftrace and fix mac build

It seems an unnecessary dependency sneaked in between filesystem
and ftrace. Not a huge deal but wasn't quite necessary at all.

TBR: hjd
Bug: 73625480
Change-Id: Id746446cc11cae0673524f329dff7d41ff426165

src/traced/probes/filesystem/inode_file_data_source.cc

diff --git a/src/traced/probes/filesystem/inode_file_data_source.cc b/src/traced/probes/filesystem/inode_file_data_source.cc
index b1a6aaa..78b5bae 100644
--- a/src/traced/probes/filesystem/inode_file_data_source.cc
+++ b/src/traced/probes/filesystem/inode_file_data_source.cc
@@ -21,9 +21,9 @@
 #include <unistd.h>
 #include <queue>
 
-#include "include/perfetto/ftrace_reader/ftrace_controller.h"
 #include "perfetto/base/logging.h"
 #include "perfetto/tracing/core/trace_packet.h"
+#include "perfetto/tracing/core/trace_writer.h"
 
 #include "perfetto/trace/trace_packet.pbzero.h"
 
@@ -78,14 +78,14 @@
     std::unique_ptr<TraceWriter> writer)
     : file_system_inodes_(file_system_inodes), writer_(std::move(writer)) {}
 
-void InodeFileDataSource::WriteInodes(const FtraceMetadata& metadata) {
+void InodeFileDataSource::WriteInodes(
+    const std::vector<std::pair<uint64_t, uint32_t>>& inodes) {
   PERFETTO_DLOG("Write Inodes start");
 
   if (mount_points_.empty()) {
     mount_points_ = ParseMounts();
   }
   // Group inodes from FtraceMetadata by block device
-  auto inodes = metadata.inodes;
   std::map<BlockDeviceID, std::set<Inode>> inode_file_maps;
   for (const auto& inode : inodes) {
     BlockDeviceID block_device_id = inode.first;