commit 5c2d318236ae5c07389d7fc4c165eddd9d226ae0
author Florian Mayer <fmayer@google.com> Tue Apr 03 15:09:31 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 03 15:09:31 2018 +0000
tree b196d00b3ec95e1895a3475304878b56926b209d
parent 420b6c096c383338405583c581b0f3eaf41cbd98
parent 727d1cb433bf06f85a69312a5c3fc1610b7cb1b6

Merge "Remove dead code"

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 fd70ff7..cc4c34c 100644
--- a/src/traced/probes/filesystem/inode_file_data_source.cc
+++ b/src/traced/probes/filesystem/inode_file_data_source.cc
@@ -36,6 +36,7 @@
 constexpr uint64_t kScanIntervalMs = 10000;  // 10s
 constexpr uint64_t kScanDelayMs = 10000;     // 10s
 constexpr uint64_t kScanBatchSize = 15000;
+constexpr uint64_t kFlushBeforeEndMs = 500;
 
 uint64_t OrDefault(uint64_t value, uint64_t def) {
   if (value != 0)
@@ -126,7 +127,22 @@
       static_file_map_(static_file_map),
       cache_(cache),
       writer_(std::move(writer)),
-      weak_factory_(this) {}
+      weak_factory_(this) {
+  auto weak_this = GetWeakPtr();
+  // Flush TracePacket of current scan shortly before we expect the trace
+  // to end, to retain information from any scan that might be in
+  // progress.
+  task_runner_->PostDelayedTask(
+      [weak_this] {
+        if (!weak_this) {
+          PERFETTO_DLOG("Giving up flush.");
+          return;
+        }
+        PERFETTO_DLOG("Flushing.");
+        weak_this->ResetTracePacket();
+      },
+      source_config_.trace_duration_ms() - kFlushBeforeEndMs);
+}
 
 void InodeFileDataSource::AddInodesFromStaticMap(
     BlockDeviceID block_device_id,
@@ -296,13 +312,17 @@
   return !missing_inodes_.empty();
 }
 
-void InodeFileDataSource::OnInodeScanDone() {
-  // Finalize the accumulated trace packets.
+void InodeFileDataSource::ResetTracePacket() {
   current_block_device_id_ = 0;
   current_file_map_ = nullptr;
   if (has_current_trace_packet_)
     current_trace_packet_->Finalize();
   has_current_trace_packet_ = false;
+}
+
+void InodeFileDataSource::OnInodeScanDone() {
+  // Finalize the accumulated trace packets.
+  ResetTracePacket();
   file_scanner_.reset();
   if (next_missing_inodes_.empty()) {
     scan_running_ = false;

src/traced/probes/filesystem/inode_file_data_source.h

diff --git a/src/traced/probes/filesystem/inode_file_data_source.h b/src/traced/probes/filesystem/inode_file_data_source.h
index 1f4197f..1282c53 100644
--- a/src/traced/probes/filesystem/inode_file_data_source.h
+++ b/src/traced/probes/filesystem/inode_file_data_source.h
@@ -88,6 +88,7 @@
 
  private:
   InodeFileMap* AddToCurrentTracePacket(BlockDeviceID block_device_id);
+  void ResetTracePacket();
   void FindMissingInodes();
   bool OnInodeFound(BlockDeviceID block_device_id,
                     Inode inode_number,