Prototyping - Python frames

.gitignore

@@ -51,7 +51,6 @@ compile_commands.json
 *.s
 *.bc
 *.swp
-*.dump
 .env
 .env_perso.yml
 test/configs/perso.yml

.gitlab-ci.yml

@@ -16,8 +16,31 @@ trigger_internal_build:
     DDPROF_SHORT_COMMIT_SHA: ${CI_COMMIT_SHORT_SHA}
     DDPROF_COMMIT_TAG: ${CI_COMMIT_TAG}
     # Reliability environment downstream branch
-    DDPROF_RELENV_BRANCH: master
+    DDPROF_RELENV_BRANCH: ${DDPROF_RELENV_BRANCH-"master"}
   trigger:
-    project: DataDog/ddprof-build
+    project: DataDog/apm-reliability/ddprof-build
     strategy: depend
     branch: $DOWNSTREAM_BUILD_BRANCH
+
+# Following jobs are required otherwise gitsync will not report downstream pipeline failure to github
+
+# This job is used to determine is downstream pipeline has succeeded
+report_failure:
+  tags: ["arch:amd64"]
+  when: on_failure
+  needs: [trigger_internal_build]
+  # allow_failure: true prevents the job from showing up in github statuses (because it's filtered by gitsync)
+  allow_failure: true
+  script:
+    - echo "STATUS=1" >> .env
+  artifacts:
+    reports:
+      dotenv: .env
+
+# Final job that will show in github statuses
+report_gitlab_CI_status:
+  tags: ["arch:amd64"]
+  when: always
+  stage: .post
+  script:
+    - exit ${STATUS}

CMakeLists.txt

@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.19)
 project(
   DDProf
   LANGUAGES C CXX
-  VERSION 0.9.3
+  VERSION 0.13.0
   DESCRIPTION "Datadog's native profiler for Linux")
 
 message(STATUS "Compiler ID: ${CMAKE_C_COMPILER_ID}")
@@ -23,8 +23,12 @@ endif()
 # ~~~
 # set(CMAKE_VERBOSE_MAKEFILE on)
 
+# Add build ID info on alpine
+add_link_options("LINKER:--build-id=sha1")
+
 # Define the include path of cmake scripts
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/util")
 
 include(ExtendBuildTypes)
 
@@ -80,22 +84,27 @@ endif()
 # libdatadog_profiling
 include(Findlibdatadog)
 
+# Event Parser
+add_subdirectory(src/event_parser)
+
 # elfutils
 include(Findelfutils)
 
 # ---- Static analysis ----
 include(ClangTidy)
-include(CppcheckConfig)
 include(Format)
 
+# Generated code needs to be available for cppcheck to work
+include(CppcheckConfig)
+add_dependencies(cppcheck DDProf::Parser)
+
 # ---- Libraries (needed by ut) ----
 
-option(DDPROF_JEMALLOC "Enable jemalloc stats" OFF)
-if(${DDPROF_JEMALLOC})
+option(DDPROF_ALLOCATOR "Define the type of allocator (STANDARD / JEMALLOC)" STANDARD)
+if("${DDPROF_ALLOCATOR}" STREQUAL "JEMALLOC")
   # jemalloc for debug
   include(Jemalloc)
-  message(STATUS "Adding jemalloc for DBG purpose" ${JEMALLOC_ROOT_DIR})
-  add_compile_definitions("DBG_JEMALLOC")
+  message(STATUS "Using Allocator Jemalloc from:" ${JEMALLOC_LIBRARIES})
 endif()
 
 # Install lib cap to retrieve capabilities
@@ -130,21 +139,24 @@ list(APPEND DDPROF_INCLUDE_LIST ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/
 # Find the source files
 aux_source_directory(src COMMON_SRC)
 aux_source_directory(src/pprof PPROF_SRC)
+aux_source_directory(src/demangler DEMANGLER_SRC)
 aux_source_directory(src/exporter EXPORTER_SRC)
 aux_source_directory(src/exe EXE_SRC)
+aux_source_directory(src/jit JIT_SRC)
 
 # Define all sources
-set(DDPROF_GLOBAL_SRC ${COMMON_SRC} ${PPROF_SRC} ${EXPORTER_SRC} ${EXE_SRC})
+set(DDPROF_GLOBAL_SRC ${COMMON_SRC} ${DEMANGLER_SRC} ${PPROF_SRC} ${EXPORTER_SRC} ${EXE_SRC}
+                      ${JIT_SRC})
 
-set(DDPROF_LIBRARY_LIST llvm-demangle ${ELFUTILS_LIBRARIES} Threads::Threads)
+set(DDPROF_LIBRARY_LIST DDProf::Parser llvm-demangle ${ELFUTILS_LIBRARIES} Threads::Threads)
 
 if(ON)
   # Add the rust library - Refactoring ongoing. OFF for now
   list(PREPEND DDPROF_LIBRARY_LIST Datadog::Profiling)
 endif()
 
-if(${DDPROF_JEMALLOC})
-  list(PREPEND DDPROF_LIBRARY_LIST jemalloc)
+if("${DDPROF_ALLOCATOR}" STREQUAL "JEMALLOC")
+  list(PREPEND DDPROF_LIBRARY_LIST ${JEMALLOC_LIBRARIES})
 endif()
 
 # libcap, can be removed from version distributed to client
@@ -191,6 +203,7 @@ set(DD_PROFILING_SOURCES
     src/lib/dd_profiling.cc
     src/lib/elfutils.cc
     src/lib/lib_embedded_data.c
+    src/lib/pthread_fixes.cc
     src/lib/savecontext.cc
     src/lib/saveregisters.cc
     src/lib/symbol_overrides.cc
@@ -203,10 +216,12 @@ set(DD_PROFILING_SOURCES
     src/ringbuffer_utils.cc
     src/signal_helper.cc
     src/sys_utils.cc
+    src/tracepoint_config.cc
     src/user_override.cc)
 
 if(BUILD_UNIVERSAL_DDPROF)
-  list(APPEND DD_PROFILING_SOURCES src/lib/glibc_fixes.c)
+  # Compiling on different libc, we need to ensure some symbols are available everywhere
+  list(APPEND DD_PROFILING_SOURCES src/lib/glibc_fixes.c src/lib/libc_compatibility.c)
 endif()
 
 # libddprofiling_embeded.so is the actual profiling library
@@ -232,6 +247,8 @@ if(BUILD_UNIVERSAL_DDPROF)
   endif()
 endif()
 
+target_link_libraries(dd_profiling-embedded PRIVATE DDProf::Parser)
+
 # Fix for link error in sanitizeddebug build mode with gcc:
 # ~~~
 # /usr/bin/ld: ./libdd_profiling.so: undefined reference to `__dynamic_cast'
@@ -247,6 +264,17 @@ target_link_libraries(
 )
 target_link_libraries(dd_profiling-embedded PUBLIC dl pthread rt)
 
+
+# add libaustin
+add_library(austin SHARED IMPORTED)
+set_target_properties(austin PROPERTIES
+  IMPORTED_LOCATION "/austin/src/libaustin.a"
+  INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/include/libaustin"
+)
+
+
+
+
 set(LIBDD_PROFILING_EMBEDDED_OBJECT "${CMAKE_BINARY_DIR}/libdd_profiling-embedded.o")
 add_custom_command(
   OUTPUT ${LIBDD_PROFILING_EMBEDDED_OBJECT}
@@ -266,6 +294,16 @@ add_exe(
   LIBRARIES ${DDPROF_LIBRARY_LIST}
   DEFINITIONS ${DDPROF_DEFINITION_LIST})
 target_link_libraries(ddprof PRIVATE libddprofiling_embedded_object)
+
+
+
+# link libaustin to ddprof
+target_link_libraries(ddprof PRIVATE austin)
+
+
+
+
+
 if(USE_LOADER)
   target_compile_definitions(ddprof PRIVATE "DDPROF_USE_LOADER")
   target_link_libraries(ddprof PRIVATE libdd_loader_object)
@@ -293,6 +331,10 @@ add_custom_command(
   COMMAND objcopy --rename-section .data=.rodata,alloc,load,readonly,data,contents
           ${DDPROF_EXE_OBJECT}
   DEPENDS ddprof)
+# add_custom_target is required here, because multiple targets depend on ${DDPROF_EXE_OBJECT}
+# Without add_custom_target (only add_custom_command), each dependent target will run the custom
+# command and they will race, leading to spurious failures.
+add_custom_target(generate_ddprof_object DEPENDS ${DDPROF_EXE_OBJECT})
 
 add_library(ddprof_exe_object OBJECT IMPORTED GLOBAL)
 set_target_properties(ddprof_exe_object PROPERTIES IMPORTED_OBJECTS "${DDPROF_EXE_OBJECT}")
@@ -305,22 +347,23 @@ target_include_directories(
                              ${CMAKE_SOURCE_DIR}/third_party)
 set_target_properties(dd_profiling-static
                       PROPERTIES PUBLIC_HEADER "${CMAKE_SOURCE_DIR}/include/lib/dd_profiling.h")
+target_link_libraries(dd_profiling-static PRIVATE DDProf::Parser)
 target_link_libraries(dd_profiling-static PUBLIC dl pthread rt)
 
 if(USE_LOADER)
   # When using a loader, libdd_profiling.so is a loader that embeds both libdd_profiling-embedded.so
   # and ddprof executable.
   add_library(dd_profiling-shared SHARED src/lib/glibc_fixes.c src/lib/lib_embedded_data.c
                                          src/lib/loader.c src/sha1.c)
-  target_link_libraries(dd_profiling-shared PRIVATE libddprofiling_embedded_object
+  target_link_libraries(dd_profiling-shared PRIVATE DDProf::Parser libddprofiling_embedded_object
                                                     ddprof_exe_object)
   target_compile_definitions(dd_profiling-shared PRIVATE DDPROF_EMBEDDED_LIB_DATA
                                                          DDPROF_EMBEDDED_EXE_DATA)
 else()
   # Without loader, libdd_profiling.so is basically the same as libdd_profiling-embedded.so plus an
   # embedded ddprof executable.
   add_library(dd_profiling-shared SHARED ${DD_PROFILING_SOURCES} src/lib/lib_embedded_data.c)
-  target_link_libraries(dd_profiling-shared PRIVATE ddprof_exe_object)
+  target_link_libraries(dd_profiling-shared PRIVATE DDProf::Parser ddprof_exe_object)
   target_compile_definitions(dd_profiling-shared PRIVATE DDPROF_EMBEDDED_EXE_DATA)
 
   # Fix for link error in sanitizeddebug build mode with gcc:
@@ -366,40 +409,6 @@ install(
   ARCHIVE DESTINATION ddprof/lib
   PUBLIC_HEADER DESTINATION ddprof/include)
 
-# ---- Declaration of native library  ----
-option(BUILD_NATIVE_LIB "Build a library out of the native profiler" ON)
-if(${BUILD_NATIVE_LIB})
-
-  # Define all sources
-  set(DDPROF_LIB_SRC ${COMMON_SRC} src/lib/ddprof_output.cc)
-
-  # Libs to link
-  set(NATIVE_LIB_LIBRARY_LIST llvm-demangle ${ELFUTILS_LIBRARIES} Threads::Threads)
-
-  if(${DDPROF_JEMALLOC})
-    list(PREPEND NATIVE_LIB_LIBRARY_LIST jemalloc)
-  endif()
-
-  # Create the lib
-  add_library(ddprof-native ${DDPROF_LIB_SRC})
-
-  set_target_properties(ddprof-native PROPERTIES VERSION ${PROJECT_VERSION})
-  set_target_properties(ddprof-native PROPERTIES COMPILE_DEFINITIONS DDPROF_NATIVE_LIB)
-
-  # libcap, can be removed from version distributed to client
-  list(APPEND NATIVE_LIB_LIBRARY_LIST libcap)
-
-  target_include_directories(ddprof-native PRIVATE ${DDPROF_INCLUDE_LIST})
-
-  target_link_libraries(ddprof-native PRIVATE ${NATIVE_LIB_LIBRARY_LIST})
-  add_library(DDProf::Native ALIAS ddprof-native)
-
-  option(ACCURACY_TEST "Enable accuracy test" OFF)
-  if(${ACCURACY_TEST})
-    add_subdirectory(test/self_unwind)
-  endif()
-endif()
-
 # ---- Unit tests ----
 
 # Unit tests Add infrastructure for enabling tests

CONTRIBUTING.md

@@ -65,4 +65,4 @@ We're always happy to help contributors with their pull requests.
 
 ## Final word
 
-Many thanks to all of our contributors, and looking forward to seeing you on Github! :tada:
+Many thanks to all of our contributors, and looking forward to seeing you on Github!

CppCheckSuppressions.txt

@@ -7,3 +7,6 @@ missingInclude
 
 // Ignore warnings from third parties
 *:*/third_party/*
+
+// Ignore Lex and Yacc defects
+*:*/event_parser/*