mi-lttng: Move deprecated symbols to liblttng-ctl

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 <kstewart@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/common/mi-lttng.cpp b/src/common/mi-lttng.cpp
index 2d201e80b2c993f787013fa93c7d5156880ddee4..3b7f716c6d36de6f65e295a8d3e8c695a2e6f924 100644 (file)
--- 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 6979f236a4c9355cb1ddccb8b4b502e1592c3ac5..703ea898bf4b9fa8aa2a3a49ffeb26adba58a6e3 100644 (file)
--- 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];