Mi: track/untrack/listing

[lttng-tools.git] / src / bin / lttng / commands / track-untrack.c

diff --git a/src/bin/lttng/commands/track-untrack.c b/src/bin/lttng/commands/track-untrack.c
index 52442cc1361b2e8d1d0574a35f3812996bb735a8..e9a6677b000579f8a3ce14aa3c9096d2d148ad52 100644 (file)
--- a/src/bin/lttng/commands/track-untrack.c
+++ b/src/bin/lttng/commands/track-untrack.c
@@ -96,6 +96,7 @@ int parse_pid_string(const char *_pid_string,
        int count = 0;
        int *pid_list = NULL;
        char *pid_string = NULL;
+       char *endptr;
 
        if (all && _pid_string) {
                ERR("An empty PID string is expected with --all");
@@ -132,13 +133,16 @@ int parse_pid_string(const char *_pid_string,
        while (one_pid_str != NULL) {
                unsigned long v;
 
-               v = strtoul(one_pid_str, NULL, 10);
+               errno = 0;
+               v = strtoul(one_pid_str, &endptr, 10);
                if ((v == 0 && errno == EINVAL)
-                               || (v == ULONG_MAX && errno == ERANGE)) {
+                               || (v == ULONG_MAX && errno == ERANGE)
+                               || (*one_pid_str != '\0' && *endptr != '\0')){
                        ERR("Error parsing PID %s", one_pid_str);
                        retval = CMD_ERROR;
                        goto error;
                }
+
                if ((long) v > INT_MAX || (int) v < 0) {
                        ERR("Invalid PID value %ld", (long) v);
                        retval = CMD_ERROR;
@@ -198,7 +202,7 @@ int track_untrack_pid(enum cmd_type cmd_type, const char *cmd_str,
                const char *session_name, const char *pid_string,
                int all, struct mi_writer *writer)
 {
-       int ret, retval = CMD_SUCCESS, i;
+       int ret, retval = CMD_SUCCESS, success = 1 , i;
        int *pid_list = NULL;
        int nr_pids;
        struct lttng_domain dom;
@@ -244,26 +248,49 @@ int track_untrack_pid(enum cmd_type cmd_type, const char *cmd_str,
        }
 
        if (writer) {
-               /* Open pids element */
-               ret = mi_lttng_writer_open_element(writer, config_element_pids);
+               /* Open process element */
+               ret = mi_lttng_targets_open(writer);
                if (ret) {
                        retval = CMD_ERROR;
                        goto end;
                }
        }
 
-       /* TODO: MI */
        for (i = 0; i < nr_pids; i++) {
                DBG("%s PID %d", cmd_str, pid_list[i]);
                ret = lib_func(handle, pid_list[i]);
                if (ret) {
+                       success = 0;
                        retval = CMD_ERROR;
-                       goto end;
+               } else {
+                       success = 1;
+               }
+
+               /* Mi */
+               if (writer) {
+                       ret = mi_lttng_pid_target(writer, pid_list[i], 1);
+                       if (ret) {
+                               retval = CMD_ERROR;
+                               goto end;
+                       }
+
+                       ret = mi_lttng_writer_write_element_bool(writer,
+                                       mi_lttng_element_success, success);
+                       if (ret) {
+                               retval = CMD_ERROR;
+                               goto end;
+                       }
+
+                       ret = mi_lttng_writer_close_element(writer);
+                       if (ret) {
+                               retval = CMD_ERROR;
+                               goto end;
+                       }
                }
        }
 
        if (writer) {
-               /* Close pids element */
+               /* Close targets element */
                ret = mi_lttng_writer_close_element(writer);
                if (ret) {
                        retval = CMD_ERROR;
@@ -271,7 +298,6 @@ int track_untrack_pid(enum cmd_type cmd_type, const char *cmd_str,
                }
        }
 
-       /* SUCCESS */
 end:
        if (handle) {
                lttng_destroy_handle(handle);