Port: Remove _GNU_SOURCE, defined in config.h

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

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 108f76065f907ad8b2dc9606b45b3d28dfdf2369..ccbb5b419359414aa626622bd64cc08535f36a26 100644 (file)
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -15,7 +15,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <inttypes.h>
 #include <popt.h>
@@ -340,7 +339,7 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
                goto end;
        }
 
-       /* Open pids element */
+       /* Open pids element element */
        ret = mi_lttng_pids_open(writer);
        if (ret) {
                goto end;
@@ -349,7 +348,7 @@ static int mi_list_agent_ust_events(struct lttng_event *events, int count,
        for (i = 0; i < count; i++) {
                if (cur_pid != events[i].pid) {
                        if (pid_element_open) {
-                               /* Close the previous events and  pid element */
+                               /* Close the previous events and pid element */
                                ret = mi_lttng_close_multi_element(writer, 2);
                                if (ret) {
                                        goto end;
@@ -408,7 +407,7 @@ static int list_agent_events(void)
 {
        int i, size, ret = CMD_SUCCESS;
        struct lttng_domain domain;
-       struct lttng_handle *handle;
+       struct lttng_handle *handle = NULL;
        struct lttng_event *event_list = NULL;
        pid_t cur_pid = 0;
        char *cmdline = NULL;
@@ -421,6 +420,10 @@ static int list_agent_events(void)
                domain.type = LTTNG_DOMAIN_LOG4J;
        } else if (opt_python) {
                domain.type = LTTNG_DOMAIN_PYTHON;
+       } else {
+               ERR("Invalid agent domain selected.");
+               ret = CMD_ERROR;
+               goto error;
        }
 
        agent_domain_str = get_domain_str(domain.type);
@@ -489,7 +492,7 @@ static int list_ust_events(void)
        int i, size, ret = CMD_SUCCESS;
        struct lttng_domain domain;
        struct lttng_handle *handle;
-       struct lttng_event *event_list;
+       struct lttng_event *event_list = NULL;
        pid_t cur_pid = 0;
        char *cmdline = NULL;
 
@@ -657,7 +660,7 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count,
                }
        }
 
-       /* Close pids, domain, domains */
+       /* Close pid, domain, domains */
        ret = mi_lttng_close_multi_element(writer, 3);
 end:
        return ret;
@@ -981,11 +984,21 @@ static int list_session_agent_events(void)
                }
 
                for (i = 0; i < count; i++) {
-                       MSG("%s- %s%s (loglevel%s %s)", indent4, events[i].name,
-                                       enabled_string(events[i].enabled),
-                                       logleveltype_string(events[i].loglevel_type),
-                                       mi_lttng_loglevel_string(events[i].loglevel,
-                                               handle->domain.type));
+                       if (events[i].loglevel_type !=
+                                       LTTNG_EVENT_LOGLEVEL_ALL) {
+                               MSG("%s- %s%s (loglevel%s %s)", indent4,
+                                               events[i].name,
+                                               enabled_string(
+                                                       events[i].enabled),
+                                               logleveltype_string(
+                                                       events[i].loglevel_type),
+                                               mi_lttng_loglevel_string(
+                                                       events[i].loglevel,
+                                                       handle->domain.type));
+                       } else {
+                               MSG("%s- %s%s", indent4, events[i].name,
+                                   enabled_string(events[i].enabled));
+                       }
                }
 
                MSG("");
@@ -1239,7 +1252,8 @@ error_channels:
  */
 static int list_tracker_pids(void)
 {
-       int enabled, ret;
+       int ret = 0;
+       int enabled;
        int *pids = NULL;
        size_t nr_pids;
 
@@ -1252,16 +1266,76 @@ static int list_tracker_pids(void)
                int i;
                _MSG("PID tracker: [");
 
+               /* Mi tracker_pid element*/
+               if (writer) {
+                       /* Open tracker_pid and targets elements */
+                       ret = mi_lttng_pid_tracker_open(writer);
+                       if (ret) {
+                               goto end;
+                       }
+               }
+
                for (i = 0; i < nr_pids; i++) {
                        if (i) {
                                _MSG(",");
                        }
                        _MSG(" %d", pids[i]);
+
+                       /* Mi */
+                       if (writer) {
+                               ret = mi_lttng_pid_target(writer, pids[i], 0);
+                               if (ret) {
+                                       goto end;
+                               }
+                       }
                }
                _MSG(" ]\n\n");
+
+               /* Mi close tracker_pid and targets */
+               if (writer) {
+                       ret = mi_lttng_close_multi_element(writer,2);
+                       if (ret) {
+                               goto end;
+                       }
+               }
        }
+end:
        free(pids);
-       return 0;
+       return ret;
+
+}
+
+/*
+ * List all tracker of a domain
+ */
+static int list_trackers(void)
+{
+       int ret;
+
+       /* Trackers listing */
+       if (lttng_opt_mi) {
+               ret = mi_lttng_trackers_open(writer);
+               if (ret) {
+                       goto end;
+               }
+       }
+
+       /* pid tracker */
+       ret = list_tracker_pids();
+       if (ret) {
+               goto end;
+       }
+
+       if (lttng_opt_mi) {
+               /* Close trackers element */
+               ret = mi_lttng_writer_close_element(writer);
+               if (ret) {
+                       goto end;
+               }
+       }
+
+end:
+       return ret;
 }
 
 /*
@@ -1688,11 +1762,14 @@ int cmd_list(int argc, const char **argv)
 
                        }
 
-                       ret = list_tracker_pids();
+
+                       /* Trackers */
+                       ret = list_trackers();
                        if (ret) {
                                goto end;
                        }
 
+                       /* Channels */
                        ret = list_channels(opt_channel);
                        if (ret) {
                                goto end;
@@ -1777,13 +1854,14 @@ int cmd_list(int argc, const char **argv)
                                        if (ret) {
                                                goto end;
                                        }
-                                       continue;
+
+                                       goto next_domain;
                                }
 
                                switch (domains[i].type) {
                                case LTTNG_DOMAIN_KERNEL:
                                case LTTNG_DOMAIN_UST:
-                                       ret = list_tracker_pids();
+                                       ret = list_trackers();
                                        if (ret) {
                                                goto end;
                                        }
@@ -1797,6 +1875,7 @@ int cmd_list(int argc, const char **argv)
                                        goto end;
                                }
 
+next_domain:
                                if (lttng_opt_mi) {
                                        /* Close domain element */
                                        ret = mi_lttng_writer_close_element(writer);