X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=f59e4bc0b3576dcf43ab66a7ef1a465dee2e25df;hp=b436777d671b74bb2165d97eae9a5e6a1c6604e7;hb=00505bae99a7c67f81a9c198ef2d53f172f34f77;hpb=2fa605f7de6b95f50fc864072bc1445c61eb2c79 diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c index b436777d6..f59e4bc0b 100644 --- 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 #include @@ -25,6 +24,7 @@ #include #include +#include #include "../command.h" @@ -106,7 +106,8 @@ static char *get_cmdline_by_pid(pid_t pid) int ret; FILE *fp = NULL; char *cmdline = NULL; - char path[20]; /* Can't go bigger than /proc/65535/cmdline */ + /* Can't go bigger than /proc/LTTNG_MAX_PID/cmdline */ + char path[sizeof("/proc//cmdline") + sizeof(LTTNG_MAX_PID_STR) - 1]; snprintf(path, sizeof(path), "/proc/%d/cmdline", pid); fp = fopen(path, "r"); @@ -165,21 +166,9 @@ const char *enabled_string(int value) } static -const char *filter_string(int value) +const char *safe_string(const char *str) { - switch (value) { - case 1: return " [with filter]"; - default: return ""; - } -} - -static -const char *exclusion_string(int value) -{ - switch (value) { - case 1: return " [has exclusions]"; - default: return ""; - } + return str ? str : ""; } static const char *logleveltype_string(enum lttng_loglevel_type value) @@ -211,11 +200,104 @@ static const char *bitness_event(enum lttng_event_flag flags) } } +/* + * Get exclusion names message for a single event. + * + * Returned pointer must be freed by caller. Returns NULL on error. + */ +static char *get_exclusion_names_msg(struct lttng_event *event) +{ + int ret; + int exclusion_count; + char *exclusion_msg = NULL; + char *at; + size_t i; + const char * const exclusion_fmt = " [exclusions: "; + const size_t exclusion_fmt_len = strlen(exclusion_fmt); + + exclusion_count = lttng_event_get_exclusion_name_count(event); + if (exclusion_count < 0) { + goto end; + } else if (exclusion_count == 0) { + /* + * No exclusions: return copy of empty string so that + * it can be freed by caller. + */ + exclusion_msg = strdup(""); + goto end; + } + + /* + * exclusion_msg's size is bounded by the exclusion_fmt string, + * a comma per entry, the entry count (fixed-size), a closing + * bracket, and a trailing \0. + */ + exclusion_msg = malloc(exclusion_count + + exclusion_count * LTTNG_SYMBOL_NAME_LEN + + exclusion_fmt_len + 1); + if (!exclusion_msg) { + goto end; + } + + at = strcpy(exclusion_msg, exclusion_fmt) + exclusion_fmt_len; + for (i = 0; i < exclusion_count; ++i) { + const char *name; + + /* Append comma between exclusion names */ + if (i > 0) { + *at = ','; + at++; + } + + ret = lttng_event_get_exclusion_name(event, i, &name); + if (ret) { + /* Prints '?' on local error; should never happen */ + *at = '?'; + at++; + continue; + } + + /* Append exclusion name */ + at += sprintf(at, "%s", name); + } + + /* This also puts a final '\0' at the end of exclusion_msg */ + strcpy(at, "]"); + +end: + return exclusion_msg; +} + /* * Pretty print single event. */ static void print_events(struct lttng_event *event) { + int ret; + const char *filter_str; + char *filter_msg = NULL; + char *exclusion_msg = NULL; + + ret = lttng_event_get_filter_string(event, &filter_str); + + if (ret) { + filter_msg = strdup(" [failed to retrieve filter]"); + } else if (filter_str) { + const char * const filter_fmt = " [filter: '%s']"; + + filter_msg = malloc(strlen(filter_str) + + strlen(filter_fmt) + 1); + if (filter_msg) { + sprintf(filter_msg, filter_fmt, + filter_str); + } + } + + exclusion_msg = get_exclusion_names_msg(event); + if (!exclusion_msg) { + exclusion_msg = strdup(" [failed to retrieve exclusions]"); + } + switch (event->type) { case LTTNG_EVENT_TRACEPOINT: { @@ -227,22 +309,22 @@ static void print_events(struct lttng_event *event) mi_lttng_loglevel_string(event->loglevel, handle->domain.type), event->loglevel, enabled_string(event->enabled), - exclusion_string(event->exclusion), - filter_string(event->filter)); + safe_string(exclusion_msg), + safe_string(filter_msg)); } else { MSG("%s%s (type: tracepoint)%s%s%s", indent6, event->name, enabled_string(event->enabled), - exclusion_string(event->exclusion), - filter_string(event->filter)); + safe_string(exclusion_msg), + safe_string(filter_msg)); } break; } case LTTNG_EVENT_FUNCTION: MSG("%s%s (type: function)%s%s", indent6, event->name, enabled_string(event->enabled), - filter_string(event->filter)); + safe_string(filter_msg)); if (event->attr.probe.addr != 0) { MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr); } else { @@ -253,7 +335,7 @@ static void print_events(struct lttng_event *event) case LTTNG_EVENT_PROBE: MSG("%s%s (type: probe)%s%s", indent6, event->name, enabled_string(event->enabled), - filter_string(event->filter)); + safe_string(filter_msg)); if (event->attr.probe.addr != 0) { MSG("%saddr: 0x%" PRIx64, indent8, event->attr.probe.addr); } else { @@ -264,7 +346,7 @@ static void print_events(struct lttng_event *event) case LTTNG_EVENT_FUNCTION_ENTRY: MSG("%s%s (type: function)%s%s", indent6, event->name, enabled_string(event->enabled), - filter_string(event->filter)); + safe_string(filter_msg)); MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name); break; case LTTNG_EVENT_SYSCALL: @@ -276,13 +358,16 @@ static void print_events(struct lttng_event *event) case LTTNG_EVENT_NOOP: MSG("%s (type: noop)%s%s", indent6, enabled_string(event->enabled), - filter_string(event->filter)); + safe_string(filter_msg)); break; case LTTNG_EVENT_ALL: /* We should never have "all" events in list. */ assert(0); break; } + + free(filter_msg); + free(exclusion_msg); } static const char *field_type(struct lttng_event_field *field) @@ -338,7 +423,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; @@ -347,7 +432,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; @@ -406,8 +491,8 @@ static int list_agent_events(void) { int i, size, ret = CMD_SUCCESS; struct lttng_domain domain; - struct lttng_handle *handle; - struct lttng_event *event_list; + struct lttng_handle *handle = NULL; + struct lttng_event *event_list = NULL; pid_t cur_pid = 0; char *cmdline = NULL; const char *agent_domain_str; @@ -419,6 +504,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); @@ -487,7 +576,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; @@ -655,7 +744,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; @@ -979,11 +1068,42 @@ 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)); + const char *filter_str; + char *filter_msg = NULL; + struct lttng_event *event = &events[i]; + + ret = lttng_event_get_filter_string(event, &filter_str); + if (ret) { + filter_msg = strdup(" [failed to retrieve filter]"); + } else if (filter_str) { + const char * const filter_fmt = + " [filter: '%s']"; + + filter_msg = malloc(strlen(filter_str) + + strlen(filter_fmt) + 1); + if (filter_msg) { + sprintf(filter_msg, filter_fmt, + filter_str); + } + } + + if (event->loglevel_type != + LTTNG_EVENT_LOGLEVEL_ALL) { + MSG("%s- %s%s (loglevel%s %s)%s", indent4, + event->name, + enabled_string(event->enabled), + logleveltype_string( + event->loglevel_type), + mi_lttng_loglevel_string( + event->loglevel, + handle->domain.type), + safe_string(filter_msg)); + } else { + MSG("%s- %s%s%s", indent4, event->name, + enabled_string(event->enabled), + safe_string(filter_msg)); + } + free(filter_msg); } MSG(""); @@ -1237,7 +1357,8 @@ error_channels: */ static int list_tracker_pids(void) { - int enabled, ret; + int ret = 0; + int enabled; int *pids = NULL; size_t nr_pids; @@ -1250,16 +1371,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; } /* @@ -1686,11 +1867,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; @@ -1775,13 +1959,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; } @@ -1795,6 +1980,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);