commit c99a2310f980bab0211799b47dcf191bc2bf0163
author Florian Mayer <fmayer@google.com> Tue Dec 17 11:07:34 2019 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 17 12:36:49 2019 +0000
tree 70dc2e574bcd35d7a5ac3b6dc156a1bf99fbc970
parent 796aa2cfcde9c88fa0a3176899e25bab3468ebd2

Add timestamp to perfetto_hprof output

Change-Id: I4e2172c5a4dcab6faa45a404d4b0cf5ac77160d3

perfetto_hprof/perfetto_hprof.cc

diff --git a/perfetto_hprof/perfetto_hprof.cc b/perfetto_hprof/perfetto_hprof.cc
index bf9e6df..a96d40dd 100644
--- a/perfetto_hprof/perfetto_hprof.cc
+++ b/perfetto_hprof/perfetto_hprof.cc
@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <thread>
+#include <time.h>
 
 #include "gc/heap-visit-objects-inl.h"
 #include "gc/heap.h"
@@ -218,8 +219,8 @@
 
 class Writer {
  public:
-  Writer(pid_t parent_pid, JavaHprofDataSource::TraceContext* ctx)
-      : parent_pid_(parent_pid), ctx_(ctx) {}
+  Writer(pid_t parent_pid, JavaHprofDataSource::TraceContext* ctx, uint64_t timestamp)
+      : parent_pid_(parent_pid), ctx_(ctx), timestamp_(timestamp) {}
 
   perfetto::protos::pbzero::HeapGraph* GetHeapGraph() {
     if (!heap_graph_ || ++objects_written_ % kObjectsPerPacket == 0) {
@@ -229,6 +230,7 @@
       Finalize();
 
       trace_packet_ = ctx_->NewTracePacket();
+      trace_packet_->set_timestamp(timestamp_);
       heap_graph_ = trace_packet_->set_heap_graph();
       heap_graph_->set_pid(parent_pid_);
       heap_graph_->set_index(index_++);
@@ -248,6 +250,7 @@
  private:
   const pid_t parent_pid_;
   JavaHprofDataSource::TraceContext* const ctx_;
+  const uint64_t timestamp_;
 
   perfetto::DataSource<JavaHprofDataSource>::TraceContext::TracePacketHandle
       trace_packet_;
@@ -368,10 +371,16 @@
   // below hangs, the fork will go away from the watchdog.
   ArmWatchdogOrDie();
 
+  struct timespec ts = {};
+  if (clock_gettime(CLOCK_BOOTTIME, &ts) != 0) {
+    LOG(FATAL) << "Failed to get boottime.";
+  }
+  uint64_t timestamp = ts.tv_sec * 1000000000LL + ts.tv_nsec;
+
   WaitForDataSource(self);
 
   JavaHprofDataSource::Trace(
-      [parent_pid](JavaHprofDataSource::TraceContext ctx)
+      [parent_pid, timestamp](JavaHprofDataSource::TraceContext ctx)
           NO_THREAD_SAFETY_ANALYSIS {
             {
               auto ds = ctx.GetDataSourceLocked();
@@ -381,7 +390,7 @@
               }
             }
             LOG(INFO) << "dumping heap for " << parent_pid;
-            Writer writer(parent_pid, &ctx);
+            Writer writer(parent_pid, &ctx, timestamp);
             // Make sure that intern ID 0 (default proto value for a uint64_t) always maps to ""
             // (default proto value for a string).
             std::map<std::string, uint64_t> interned_fields{{"", 0}};