From 24496c7760f0fb6f7a0510b8087f7d4a1ad79d9c Mon Sep 17 00:00:00 2001
From: Daniel Xu <dxu@dxuuu.xyz>
Date: Tue, 2 Jul 2019 12:14:40 -0700
Subject: [PATCH] Lazify ProcSyms::find_name

It's pretty much strictly better to walk all the symbol names on demand
to find a symbol rather than storing it all in memory beforehand.
---
 src/cc/bcc_syms.cc | 42 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/cc/bcc_syms.cc b/src/cc/bcc_syms.cc
index 83cb82761f14..69a8f01afc83 100644
--- a/src/cc/bcc_syms.cc
+++ b/src/cc/bcc_syms.cc
@@ -322,15 +322,43 @@ bool ProcSyms::Module::contains(uint64_t addr, uint64_t &offset) const {
 }
 
 bool ProcSyms::Module::find_name(const char *symname, uint64_t *addr) {
-  load_sym_table();
+  struct Payload {
+    const char *symname;
+    uint64_t *out;
+    bool found;
+  };
 
-  for (Symbol &s : syms_) {
-    if (*(s.name) == symname) {
-      *addr = type_ == ModuleType::SO ? start() + s.start : s.start;
-      return true;
+  Payload payload;
+  payload.symname = symname;
+  payload.out = addr;
+  payload.found = false;
+
+  auto cb = [](const char *name, uint64_t start, uint64_t size, void *p) {
+    Payload *payload = static_cast<Payload*>(p);
+
+    if (!strcmp(payload->symname, name)) {
+      payload->found = true;
+      *(payload->out) = start;
+      return -1;  // Stop iteration
     }
-  }
-  return false;
+
+    return 0;
+  };
+
+  if (type_ == ModuleType::PERF_MAP)
+    bcc_perf_map_foreach_sym(name_.c_str(), cb, &payload);
+  if (type_ == ModuleType::EXEC || type_ == ModuleType::SO)
+    bcc_elf_foreach_sym(name_.c_str(), cb, symbol_option_, &payload);
+  if (type_ == ModuleType::VDSO)
+    bcc_elf_foreach_vdso_sym(cb, &payload);
+
+  if (!payload.found)
+    return false;
+
+  if (type_ == ModuleType::SO)
+    *(payload.out) += start();
+
+  return true;
 }
 
 bool ProcSyms::Module::find_addr(uint64_t offset, struct bcc_symbol *sym) {