Simpleperf: add vaddr_in_file sort key in report command.

Currently report command can't report more details than function name.
After adding vaddr_in_file sort key, it can report the place of the
instruction being sampled. vaddr_in_file is the instruction's virtual
address in elf file, which matches output generated by objdump.

Bug: 29826956
Test: run simpleperf_unit_test.
Change-Id: Ifad4dfb7c60014a03c01ffbfd0b972858f1a4884

1 files changed, 12 insertions, 3 deletions

diff --git a/simpleperf/sample_tree.h b/simpleperf/sample_tree.h
index 86becbe3..eb4e38ae 100644
--- a/simpleperf/sample_tree.h
+++ b/simpleperf/sample_tree.h
@@ -54,6 +54,7 @@ class SampleTreeBuilder {
   SampleTreeBuilder(SampleComparator<EntryT> comparator)
       : sample_set_(comparator),
         accumulate_callchain_(false),
+        sample_comparator_(comparator),
         callchain_sample_set_(comparator),
         use_branch_address_(false),
         build_callchain_(false),
@@ -189,9 +190,7 @@ class SampleTreeBuilder {
                                         const std::vector<EntryT*>& callchain,
                                         const AccumulateInfoT& acc_info) = 0;
   virtual const ThreadEntry* GetThreadOfSample(EntryT*) = 0;
-  virtual void InsertCallChainForSample(EntryT* sample,
-                                        const std::vector<EntryT*>& callchain,
-                                        const AccumulateInfoT& acc_info) = 0;
+  virtual uint64_t GetPeriodForCallChain(const AccumulateInfoT& acc_info) = 0;
   virtual bool FilterSample(const EntryT*) { return true; }
 
   virtual void UpdateSummary(const EntryT*) {}
@@ -245,10 +244,20 @@ class SampleTreeBuilder {
     return InsertSample(std::move(sample));
   }
 
+  void InsertCallChainForSample(EntryT* sample,
+                                const std::vector<EntryT*>& callchain,
+                                const AccumulateInfoT& acc_info) {
+    uint64_t period = GetPeriodForCallChain(acc_info);
+    sample->callchain.AddCallChain(callchain, period, [&](const EntryT* s1, const EntryT* s2) {
+      return sample_comparator_.IsSameSample(s1, s2);
+    });
+  }
+
   std::set<EntryT*, SampleComparator<EntryT>> sample_set_;
   bool accumulate_callchain_;
 
  private:
+  const SampleComparator<EntryT> sample_comparator_;
   // If a CallChainSample is filtered out, it is stored in callchain_sample_set_
   // and only used in other EntryT's callchain.
   std::set<EntryT*, SampleComparator<EntryT>> callchain_sample_set_;