Support lttng-ctl 2.12

Signed-off-by: Christophe Bedard <[email protected]>
ros2 · Dec 14, 2023 · 4a870d0 · 4a870d0
1 parent 49b6dba
commit 4a870d0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/lttngpy/CMakeLists.txt b/lttngpy/CMakeLists.txt
@@ -37,13 +37,24 @@ if(NOT LTTNGPY_DISABLED)
   find_package(PkgConfig REQUIRED)
   pkg_check_modules(LTTNG_CTL REQUIRED lttng-ctl)
   set(LTTNG_CTL_VERSION ${LTTNG_CTL_VERSION})
+
+  string(REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" dummy "${LTTNG_CTL_VERSION}")
+  set(LTTNG_CTL_VERSION_MAJOR "${CMAKE_MATCH_1}")
+  set(LTTNG_CTL_VERSION_MINOR "${CMAKE_MATCH_2}")
+  set(LTTNG_CTL_VERSION_PATCH "${CMAKE_MATCH_3}")
 else()
   set(LTTNG_CTL_VERSION "")
+  set(LTTNG_CTL_VERSION_MAJOR "0")
+  set(LTTNG_CTL_VERSION_MINOR "0")
+  set(LTTNG_CTL_VERSION_PATCH "0")
 endif()
 
 # Store configuration variable for buildtime use
 #   LTTNGPY_DISABLED
 #   LTTNG_CTL_VERSION
+#   LTTNG_CTL_VERSION_MAJOR
+#   LTTNG_CTL_VERSION_MINOR
+#   LTTNG_CTL_VERSION_PATCH
 configure_file(src/lttngpy/config.hpp.in src/lttngpy/config.hpp)
 
 ament_python_install_package(${PROJECT_NAME})

diff --git a/lttngpy/src/lttngpy/_lttngpy_pybind11.cpp b/lttngpy/src/lttngpy/_lttngpy_pybind11.cpp
@@ -323,6 +323,7 @@ PYBIND11_MODULE(_lttngpy_pybind11, m) {
   .value(
     "LTTNG_ERR_PROCESS_ATTR_TRACKER_INVALID_TRACKING_POLICY",
     LTTNG_ERR_PROCESS_ATTR_TRACKER_INVALID_TRACKING_POLICY)
+#if (LTTNG_CTL_VERSION_MAJOR >= 2) && (LTTNG_CTL_VERSION_MINOR >= 13)
   .value(
     "LTTNG_ERR_EVENT_NOTIFIER_GROUP_NOTIFICATION_FD",
     LTTNG_ERR_EVENT_NOTIFIER_GROUP_NOTIFICATION_FD)
@@ -334,6 +335,7 @@ PYBIND11_MODULE(_lttngpy_pybind11, m) {
     LTTNG_ERR_EVENT_NOTIFIER_ERROR_ACCOUNTING_FULL)
   .value("LTTNG_ERR_INVALID_ERROR_QUERY_TARGET", LTTNG_ERR_INVALID_ERROR_QUERY_TARGET)
   .value("LTTNG_ERR_BUFFER_FLUSH_FAILED", LTTNG_ERR_BUFFER_FLUSH_FAILED)
+#endif  // (LTTNG_CTL_VERSION_MAJOR >= 2) && (LTTNG_CTL_VERSION_MINOR >= 13)
   .value("LTTNG_ERR_NR", LTTNG_ERR_NR)
   .value("LTTNG_ERR_PID_TRACKED", LTTNG_ERR_PID_TRACKED)
   .value("LTTNG_ERR_PID_NOT_TRACKED", LTTNG_ERR_PID_NOT_TRACKED)

diff --git a/lttngpy/src/lttngpy/config.hpp.in b/lttngpy/src/lttngpy/config.hpp.in
@@ -17,5 +17,8 @@
 
 #cmakedefine LTTNGPY_DISABLED @LTTNGPY_DISABLED@
 #define LTTNG_CTL_VERSION "@LTTNG_CTL_VERSION@"
+#define LTTNG_CTL_VERSION_MAJOR (@LTTNG_CTL_VERSION_MAJOR@)
+#define LTTNG_CTL_VERSION_MINOR (@LTTNG_CTL_VERSION_MINOR@)
+#define LTTNG_CTL_VERSION_PATCH (@LTTNG_CTL_VERSION_PATCH@)
 
 #endif  // LTTNGPY__CONFIG_HPP_