Improve a bit

DataDog · Nov 27, 2024 · 969b9e1 · 969b9e1
1 parent 7d236d0
commit 969b9e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CrashReportingLinux.cpp b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/CrashReportingLinux.cpp
@@ -22,7 +22,6 @@
 
 extern "C"
 {
-#include "datadog/blazesym.h"
 #include "datadog/common.h"
 #include "datadog/crashtracker.h"
 #include "datadog/profiling.h"
@@ -133,9 +132,7 @@ std::vector<ModuleInfo> CrashReportingLinux::GetModules()
             moduleBaseAddresses[path] = baseAddress;
         }
 
-        std::size_t len = 0;
-        auto* buffer = blaze_read_elf_build_id(path.data(), &len);
-        modules.push_back(ModuleInfo{ start, end, baseAddress, std::move(path), ElfBuildId(buffer, len)});
+        modules.push_back(ModuleInfo{ start, end, baseAddress, std::move(path), ElfBuildId(path.data())});
     }
 
     return modules;

diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native/CrashReporting.h b/profiler/src/ProfilerEngine/Datadog.Profiler.Native/CrashReporting.h
@@ -17,6 +17,7 @@
 
 extern "C"
 {
+#include "datadog/blazesym.h"
 #include "datadog/common.h"
 #include "datadog/profiling.h"
 }
@@ -38,8 +39,13 @@ class ElfBuildId
 {
 private:
     struct ElfBuildIdImpl {
-        ElfBuildIdImpl() : ElfBuildIdImpl(nullptr, 0) {}
-        ElfBuildIdImpl(std::uint8_t* ptr, std::size_t size) : _ptr{ptr}, _size{size} {};
+        ElfBuildIdImpl() : ElfBuildIdImpl(nullptr) {}
+        ElfBuildIdImpl(const char* path) : _ptr{nullptr}, _size{0} {
+            if (path != nullptr)
+            {
+                _ptr = blaze_read_elf_build_id(path, &_size);
+            }
+        };
         ~ElfBuildIdImpl()
         {
             auto* ptr = std::exchange(_ptr, nullptr);
@@ -59,9 +65,9 @@ class ElfBuildId
         std::size_t _size;
     };
 public:
-    ElfBuildId() : ElfBuildId(nullptr, 0) {}
-    ElfBuildId(std::uint8_t* ptr, std::size_t size)
-    : _impl{std::make_shared<ElfBuildIdImpl>(ptr, size)} {}
+    ElfBuildId() : ElfBuildId(nullptr) {}
+    ElfBuildId(const char* path)
+    : _impl{std::make_shared<ElfBuildIdImpl>(path)} {}
 
     shared::span<std::uint8_t> AsSpan() const
     {