Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(profiling): explicitly link with thread library [backport-2.12] #11004

Merged
merged 1 commit into from
Oct 11, 2024
Merged

fix(profiling): explicitly link with thread library [backport-2.12] #11004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ddtrace/internal/datadog/profiling/dd_wrapper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ include(FindCppcheck)
include(FindInfer)
include(CheckSymbolExists)

set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)

if(NOT Threads_FOUND OR NOT CMAKE_USE_PTHREADS_INIT)
message(FATAL_ERROR "pthread compatible library not found")
endif()

# Library sources
add_library(dd_wrapper SHARED
src/uploader_builder.cpp
Expand All @@ -46,9 +53,7 @@ target_include_directories(dd_wrapper PRIVATE
${Datadog_INCLUDE_DIRS}
)

target_link_libraries(dd_wrapper PRIVATE
${Datadog_LIBRARIES}
)
target_link_libraries(dd_wrapper PRIVATE ${Datadog_LIBRARIES} Threads::Threads)

# Figure out the suffix. Try to approximate the cpython way of doing things.
## C library
Expand Down
17 changes: 14 additions & 3 deletions ddtrace/internal/datadog/profiling/stack_v2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,19 @@ include(FindCppcheck)
# but whether or not we keep that design is unknown. Hack it for now.
add_subdirectory(../dd_wrapper ${CMAKE_CURRENT_BINARY_DIR}/../dd_wrapper_build)

find_package(Python3 COMPONENTS Interpreter Development)
# Make sure we have necessary Python variables
if (NOT Python3_INCLUDE_DIRS)
message(FATAL_ERROR "Python3_INCLUDE_DIRS not found")
endif()

set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)

if(NOT Threads_FOUND OR NOT CMAKE_USE_PTHREADS_INIT)
message(FATAL_ERROR "pthread compatible library not found")
endif()

# Add echion
set(ECHION_COMMIT "b2f2d49f2f5d5c4dd78d1d9b83280db8ac2949c0" CACHE STRING "Commit hash of echion to use")
FetchContent_Declare(
Expand Down Expand Up @@ -90,9 +98,12 @@ set_target_properties(${EXTENSION_NAME} PROPERTIES SUFFIX "")
# RPATH is needed for sofile discovery at runtime, since Python packages are not
# installed in the system path. This is typical.
set_target_properties(${EXTENSION_NAME} PROPERTIES INSTALL_RPATH "$ORIGIN/..")
target_link_libraries(${EXTENSION_NAME} PRIVATE
dd_wrapper
)

target_link_libraries(${EXTENSION_NAME} PRIVATE dd_wrapper Threads::Threads)

if(Python3_LIBRARIES)
target_link_libraries(${EXTENSION_NAME} PRIVATE ${Python3_LIBRARIES})
endif()

# Extensions are built as dynamic libraries, so PIC is required.
set_target_properties(${EXTENSION_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/profiling-pthread-aarch64-d4548fd1842d0665.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fixes:
- |
profiling: fixes an issue where stack v2 couldn't be enabled as pthread
was not properly linked on some debian based images for aarch64 architecture.

Loading