From 0bda1cc5712e9ccf87ebf89d18ea48672855d280 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Mon, 16 Dec 2024 09:28:18 -0500 Subject: [PATCH] mi-lttng: Move deprecated symbols to liblttng-ctl MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The ABI diff between 2.13 and master hilights that the deprecated variables are removed. Moving them to the deprecated-symbols file ensures they are exported. ``` [D] 'const char* const mi_lttng_context_type_perf_counter' {mi_lttng_context_type_perf_counter} [D] 'const char* const mi_lttng_context_type_perf_cpu_counter' {mi_lttng_context_type_perf_cpu_counter} [D] 'const char* const mi_lttng_context_type_perf_thread_counter' {mi_lttng_context_type_perf_thread_counter} [D] 'const char* const mi_lttng_element_calibrate' {mi_lttng_element_calibrate} [D] 'const char* const mi_lttng_element_calibrate_function' {mi_lttng_element_calibrate_function} [D] 'const char* const mi_lttng_element_command_calibrate' {mi_lttng_element_command_calibrate} [D] 'const char* const mi_lttng_element_track_untrack_pid_target' {mi_lttng_element_track_untrack_pid_target} [D] 'const char* const mi_lttng_element_track_untrack_targets' {mi_lttng_element_track_untrack_targets} ``` Change-Id: I815556fac3281e0a4bf8ed92b8be0ce1b3276d02 Signed-off-by: Kienan Stewart Signed-off-by: Jérémie Galarneau --- src/common/mi-lttng.cpp | 10 ---------- src/lib/lttng-ctl/deprecated-symbols.cpp | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/common/mi-lttng.cpp b/src/common/mi-lttng.cpp index 2d201e80b..3b7f716c6 100644 --- a/src/common/mi-lttng.cpp +++ b/src/common/mi-lttng.cpp @@ -363,16 +363,6 @@ const char *const mi_lttng_element_error_query_results = "error_query_results"; /* String related to add-context command */ const char *const mi_lttng_element_context_symbol = "symbol"; -/* Deprecated symbols preserved for ABI compatibility. */ -LTTNG_EXPORT extern const char *const mi_lttng_context_type_perf_counter; -LTTNG_EXPORT extern const char *const mi_lttng_context_type_perf_cpu_counter; -LTTNG_EXPORT extern const char *const mi_lttng_context_type_perf_thread_counter; -LTTNG_EXPORT extern const char *const mi_lttng_element_track_untrack_pid_target; -LTTNG_EXPORT extern const char *const mi_lttng_element_track_untrack_targets; -LTTNG_EXPORT extern const char *const mi_lttng_element_calibrate; -LTTNG_EXPORT extern const char *const mi_lttng_element_calibrate_function; -LTTNG_EXPORT extern const char *const mi_lttng_element_command_calibrate; - /* This is a merge of jul loglevel and regular loglevel * Those should never overlap by definition * (see struct lttng_event loglevel) diff --git a/src/lib/lttng-ctl/deprecated-symbols.cpp b/src/lib/lttng-ctl/deprecated-symbols.cpp index 6979f236a..703ea898b 100644 --- a/src/lib/lttng-ctl/deprecated-symbols.cpp +++ b/src/lib/lttng-ctl/deprecated-symbols.cpp @@ -28,12 +28,28 @@ LTTNG_EXPORT extern const char *const config_element_pid_tracker; LTTNG_EXPORT extern const char *const config_element_target_pid; LTTNG_EXPORT extern const char *const config_element_targets; LTTNG_EXPORT extern const char *const config_element_trackers; +LTTNG_EXPORT extern const char *const mi_lttng_context_type_perf_counter; +LTTNG_EXPORT extern const char *const mi_lttng_context_type_perf_cpu_counter; +LTTNG_EXPORT extern const char *const mi_lttng_context_type_perf_thread_counter; +LTTNG_EXPORT extern const char *const mi_lttng_element_track_untrack_pid_target; +LTTNG_EXPORT extern const char *const mi_lttng_element_track_untrack_targets; +LTTNG_EXPORT extern const char *const mi_lttng_element_calibrate; +LTTNG_EXPORT extern const char *const mi_lttng_element_calibrate_function; +LTTNG_EXPORT extern const char *const mi_lttng_element_command_calibrate; const char *const config_element_perf = nullptr; const char *const config_element_pid_tracker = nullptr; const char *const config_element_target_pid = nullptr; const char *const config_element_targets = nullptr; const char *const config_element_trackers = nullptr; +const char *const mi_lttng_context_type_perf_counter = nullptr; +const char *const mi_lttng_context_type_perf_cpu_counter = nullptr; +const char *const mi_lttng_context_type_perf_thread_counter = nullptr; +const char *const mi_lttng_element_track_untrack_pid_target = nullptr; +const char *const mi_lttng_element_track_untrack_targets = nullptr; +const char *const mi_lttng_element_calibrate = nullptr; +const char *const mi_lttng_element_calibrate_function = nullptr; +const char *const mi_lttng_element_command_calibrate = nullptr; struct log_time { char str[19]; -- 2.39.5