Cleanup: reuse tracker* element from config

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
index f2d223f86d95878693996e8fadc48a2b2b320515..cc2d25b52ce8ea3112d5f8fbe5ce2e2125f01b31 100644 (file)
--- a/src/common/mi-lttng.c
+++ b/src/common/mi-lttng.c
@@ -80,7 +80,6 @@ const char * const mi_lttng_element_perf_counter_context = "perf_counter_context
 /* Strings related to pid */
 const char * const mi_lttng_element_processes = "processes";
 const char * const mi_lttng_element_process = "process";
 /* Strings related to pid */
 const char * const mi_lttng_element_processes = "processes";
 const char * const mi_lttng_element_process = "process";

-const char * const mi_lttng_element_pid_id = "id";

 
 /* Strings related to save command */
 const char * const mi_lttng_element_save = "save";
 
 /* Strings related to save command */
 const char * const mi_lttng_element_save = "save";


@@ -165,8 +164,6 @@ const char * const mi_lttng_element_snapshot_session_name = "session_name";
 const char * const mi_lttng_element_snapshots = "snapshots";
 
 /* String related to track/untrack command */
 const char * const mi_lttng_element_snapshots = "snapshots";
 
 /* String related to track/untrack command */

-const char * const mi_lttng_element_track_untrack_targets = "targets";
-const char * const mi_lttng_element_track_untrack_pid_target = "pid_target";

 const char * const mi_lttng_element_track_untrack_all_wildcard = "*";
 
 
 const char * const mi_lttng_element_track_untrack_all_wildcard = "*";
 
 


@@ -1201,7 +1198,7 @@ LTTNG_HIDDEN
 int mi_lttng_targets_open(struct mi_writer *writer)
 {
        return mi_lttng_writer_open_element(writer,
 int mi_lttng_targets_open(struct mi_writer *writer)
 {
        return mi_lttng_writer_open_element(writer,

-                       mi_lttng_element_track_untrack_targets);
+                       config_element_targets);

 }
 
 LTTNG_HIDDEN
 }
 
 LTTNG_HIDDEN


@@ -1210,7 +1207,7 @@ int mi_lttng_pid_target(struct mi_writer *writer, pid_t pid, int is_open)
        int ret;
 
        ret = mi_lttng_writer_open_element(writer,
        int ret;
 
        ret = mi_lttng_writer_open_element(writer,

-                       mi_lttng_element_track_untrack_pid_target);
+                       config_element_target_pid);

        if (ret) {
                goto end;
        }
        if (ret) {
                goto end;
        }

diff --git a/src/common/mi-lttng.h b/src/common/mi-lttng.h
index 23b7810c4680de3b50d694d5b5ae7afa43f5ba0b..3722e54e2a39dd2997438b181926343fe19fa5d9 100644 (file)
--- a/src/common/mi-lttng.h
+++ b/src/common/mi-lttng.h
@@ -196,8 +196,6 @@ const char *mi_lttng_buffertype_string(enum lttng_buffer_type value);
 const char *mi_lttng_calibratetype_string(enum lttng_calibrate_type val);
 
 /* String related to track/untrack command */
 const char *mi_lttng_calibratetype_string(enum lttng_calibrate_type val);
 
 /* String related to track/untrack command */

-const char * const mi_lttng_element_track_untrack_targets;
-const char * const mi_lttng_element_track_untrack_pid_target;

 const char * const mi_lttng_element_track_untrack_all_wildcard;
 
 /*
 const char * const mi_lttng_element_track_untrack_all_wildcard;
 
 /*