Investigation

Author: gleocadie

build/cmake/FindLibunwind.cmake

@@ -1,10 +1,10 @@
-SET(LIBUNWIND_VERSION "v1.8.1-custom-2")
+SET(LIBUNWIND_VERSION "v1.8.1-custom-3")
 
 SET(LIBUNWIND_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/libunwind-prefix/src/libunwind-build)
 
 ExternalProject_Add(libunwind
     GIT_REPOSITORY https://github.com/DataDog/libunwind.git
-    GIT_TAG kevin/v1.8.1-custom-2
+    GIT_TAG gleocadie/v1.8.1-custom-3
     GIT_PROGRESS true
     INSTALL_COMMAND ""
     UPDATE_COMMAND ""

profiler/src/ProfilerEngine/Datadog.Profiler.Native.Linux/LibrariesInfoCache.cpp

@@ -61,6 +61,12 @@ bool LibrariesInfoCache::StartImpl()
     // Note: unw_set_iterate_phdr_function will call tdep_init() if needed,
     // which has once-initialization semantics, so this is thread-safe.
     unw_set_iterate_phdr_function(unw_local_addr_space, LibrariesInfoCache::DlIteratePhdr);
+    auto fn = unw_get_iterate_phdr_function(unw_local_addr_space);
+    if (fn != LibrariesInfoCache::DlIteratePhdr)
+    {
+        Log::Error("Failed to register custom iterate_phdr_function with libunwind.");
+        return false;
+    }
 
     // CRITICAL: Force a memory barrier to ensure the write to iterate_phdr_function
     // is visible to all CPU cores. libunwind's unw_set_iterate_phdr_function does