Add module id in android sampling profiles

The unwinder uses module cache on Android to get module ids.

Change-Id: Iec80ae7f77581ce45d96a9f2b5d5585c3d1a7bb6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1699305
Commit-Queue: ssid <ssid@chromium.org>
Reviewed-by: oysteine <oysteine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#677101}

services/tracing/public/cpp/stack_sampling/stack_sampler_android.cc

@@ -13,8 +13,9 @@ namespace {
 constexpr size_t kMaxFrameDepth = 48;
 }  // namespace
 
-StackSamplerAndroid::StackSamplerAndroid(base::PlatformThreadId tid)
-    : tid_(tid) {}
+StackSamplerAndroid::StackSamplerAndroid(base::PlatformThreadId tid,
+                                         base::ModuleCache* module_cache)
+    : tid_(tid), module_cache_(module_cache) {}
 
 StackSamplerAndroid::~StackSamplerAndroid() = default;
 
@@ -38,8 +39,8 @@ void StackSamplerAndroid::RecordStackFrames(
   std::vector<base::Frame> frames;
   frames.reserve(depth);
   for (size_t i = 0; i < depth; ++i) {
-    // TODO(ssid): Add support for obtaining modules here.
-    frames.emplace_back(reinterpret_cast<uintptr_t>(pcs[i]), nullptr);
+    uintptr_t address = reinterpret_cast<uintptr_t>(pcs[i]);
+    frames.emplace_back(address, module_cache_->GetModuleForAddress(address));
   }
   profile_builder->OnSampleCompleted(std::move(frames));
 }

services/tracing/public/cpp/stack_sampling/stack_sampler_android.h

@@ -6,6 +6,7 @@
 #define SERVICES_TRACING_PUBLIC_CPP_STACK_SAMPLING_STACK_SAMPLER_ANDROID_H_
 
 #include "base/profiler/stack_sampler.h"
+#include "base/sampling_heap_profiler/module_cache.h"
 #include "base/threading/platform_thread.h"
 #include "services/tracing/public/cpp/stack_sampling/stack_unwinder_android.h"
 
@@ -18,7 +19,8 @@ class StackSamplerAndroid : public base::StackSampler {
   // StackUnwinderAndroid only supports sampling one thread at a time. So, the
   // clients of this class must ensure synchronization between multiple
   // instances of the sampler.
-  explicit StackSamplerAndroid(base::PlatformThreadId thread_id);
+  explicit StackSamplerAndroid(base::PlatformThreadId thread_id,
+                               base::ModuleCache*);
   ~StackSamplerAndroid() override;
 
   StackSamplerAndroid(const StackSamplerAndroid&) = delete;
@@ -31,6 +33,7 @@ class StackSamplerAndroid : public base::StackSampler {
 
  private:
   base::PlatformThreadId tid_;
+  base::ModuleCache* module_cache_;
   StackUnwinderAndroid unwinder_;
 };
 

services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc

@@ -279,6 +279,11 @@ TracingSamplerProfiler::TracingProfileBuilder::GetCallstackIDAndMaybeEmit(
     // useless anyway.
     if (frame_name.empty())
       frame_name = "Unknown";
+    if (frame.module) {
+      module_id = frame.module->GetId();
+      if (module_name.empty())
+        module_name = frame.module->GetDebugBasename().MaybeAsASCII();
+    }
 #else
     if (frame.module) {
       module_name = frame.module->GetDebugBasename().MaybeAsASCII();
@@ -447,11 +452,13 @@ void TracingSamplerProfiler::StartTracing(
   // Create and start the stack sampling profiler.
 #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \
     defined(OFFICIAL_BUILD)
+  auto profile_builder = std::make_unique<TracingProfileBuilder>(
+      sampled_thread_id_, std::move(trace_writer), should_enable_filtering);
+  auto* module_cache = profile_builder->GetModuleCache();
   profiler_ = std::make_unique<base::StackSamplingProfiler>(
-      sampled_thread_id_, params,
-      std::make_unique<TracingProfileBuilder>(
-          sampled_thread_id_, std::move(trace_writer), should_enable_filtering),
-      std::make_unique<StackSamplerAndroid>(sampled_thread_id_));
+      sampled_thread_id_, params, std::move(profile_builder),
+      std::make_unique<StackSamplerAndroid>(sampled_thread_id_, module_cache));
+
 #else
   profiler_ = std::make_unique<base::StackSamplingProfiler>(
       sampled_thread_id_, params,