commit 710f372ded0da30ffaf4b776e2ff99971a8707c2
author Yabin Cui <yabinc@google.com> Tue Mar 23 17:45:39 2021 -0700
committer Yabin Cui <yabinc@google.com> Wed Mar 24 10:24:18 2021 -0700
tree f95ebb4bc3ade7866f02cfbe1c7bffd624177f79
parent 2881b21beda06a42c830e41a8019c292488a4880

simpleperf: use callback API to read dex symbols.

In experiment, it saves about 20% time reading dex symbols.

Bug: none
Test: run simpleperf_unit_test
Change-Id: I0e6bfd1f51f99f57175fece77c2ee3518e676a71

simpleperf/dso.cpp

diff --git a/simpleperf/dso.cpp b/simpleperf/dso.cpp
index 77a8b15..d3b7ffb 100644
--- a/simpleperf/dso.cpp
+++ b/simpleperf/dso.cpp
@@ -463,9 +463,12 @@
 
   std::vector<Symbol> LoadSymbolsImpl() override {
     std::vector<Symbol> symbols;
-    std::vector<DexFileSymbol> dex_file_symbols;
     auto tuple = SplitUrlInApk(debug_file_path_);
     bool status = false;
+    auto symbol_callback = [&](DexFileSymbol* dex_symbol) {
+      symbols.emplace_back(std::string_view(dex_symbol->name, dex_symbol->name_size),
+                           dex_symbol->addr, dex_symbol->size);
+    };
     if (std::get<0>(tuple)) {
       std::unique_ptr<ArchiveHelper> ahelper = ArchiveHelper::CreateInstance(std::get<1>(tuple));
       ZipEntry entry;
@@ -473,10 +476,10 @@
       if (ahelper && ahelper->FindEntry(std::get<2>(tuple), &entry) &&
           ahelper->GetEntryData(entry, &data)) {
         status = ReadSymbolsFromDexFileInMemory(data.data(), data.size(), dex_file_offsets_,
-                                                &dex_file_symbols);
+                                                symbol_callback);
       }
     } else {
-      status = ReadSymbolsFromDexFile(debug_file_path_, dex_file_offsets_, &dex_file_symbols);
+      status = ReadSymbolsFromDexFile(debug_file_path_, dex_file_offsets_, symbol_callback);
     }
     if (!status) {
       android::base::LogSeverity level =
@@ -485,9 +488,6 @@
       return symbols;
     }
     LOG(VERBOSE) << "Read symbols from " << debug_file_path_ << " successfully";
-    for (auto& symbol : dex_file_symbols) {
-      symbols.emplace_back(symbol.name, symbol.offset, symbol.len);
-    }
     SortAndFixSymbols(symbols);
     return symbols;
   }