simpleperf: use file records in protobuf output.

Dump file name and symbol name for each CallChainEntry
takes too much space. So instead we store file_id and
symbol_id for each CallChainEntry, and store file
records separately.

In CallChainEntry, replace ip with vaddr_in_file, because
vaddr_in_file is more useful in finding instructions in
elf file.

Bug: http://b/32210800
Test: simpleperf_unit_test.
Change-Id: I85542db21acbaa4d81b3c3aa7f9215f2d23c4878

1 files changed, 5 insertions, 6 deletions

diff --git a/simpleperf/thread_tree.cpp b/simpleperf/thread_tree.cpp
index 5868502b..84cfb599 100644
--- a/simpleperf/thread_tree.cpp
+++ b/simpleperf/thread_tree.cpp
@@ -209,14 +209,10 @@ const MapEntry* ThreadTree::FindMap(const ThreadEntry* thread, uint64_t ip) {
 }
 
 const Symbol* ThreadTree::FindSymbol(const MapEntry* map, uint64_t ip,
-                                     uint64_t* pvaddr_in_file) {
+                                     uint64_t* pvaddr_in_file, Dso** pdso) {
   uint64_t vaddr_in_file;
   Dso* dso = map->dso;
-  if (dso == kernel_dso_.get()) {
-    vaddr_in_file = ip;
-  } else {
-    vaddr_in_file = ip - map->start_addr + map->dso->MinVirtualAddress();
-  }
+  vaddr_in_file = ip - map->start_addr + map->dso->MinVirtualAddress();
   const Symbol* symbol = dso->FindSymbol(vaddr_in_file);
   if (symbol == nullptr && map->in_kernel && dso != kernel_dso_.get()) {
     // It is in a kernel module, but we can't find the kernel module file, or
@@ -241,6 +237,9 @@ const Symbol* ThreadTree::FindSymbol(const MapEntry* map, uint64_t ip,
   if (pvaddr_in_file != nullptr) {
     *pvaddr_in_file = vaddr_in_file;
   }
+  if (pdso != nullptr) {
+    *pdso = dso;
+  }
   return symbol;
 }