X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=8f07bb2da253e8de18c7aff280e5b472294f8112;hb=e50e81d3670e2420810ff62a036a7303b578e1e1;hp=efa1abfd0751e4c9f7858114cbf7009a94ae0a2d;hpb=7b4a95b1c7f01bc90846ab4dede0376ffe3dcf99;p=lttng-tools.git diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c index efa1abfd0..8f07bb2da 100644 --- a/src/bin/lttng/commands/list.c +++ b/src/bin/lttng/commands/list.c @@ -42,6 +42,12 @@ const char *indent4 = " "; const char *indent6 = " "; const char *indent8 = " "; +#ifdef LTTNG_EMBED_HELP +static const char help_msg[] = +#include +; +#endif + enum { OPT_HELP = 1, OPT_USERSPACE, @@ -51,6 +57,9 @@ enum { static struct lttng_handle *handle; static struct mi_writer *writer; +/* Only set when listing a single session. */ +static struct lttng_session listed_session; + static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ {"help", 'h', POPT_ARG_NONE, 0, OPT_HELP, 0, 0}, @@ -67,34 +76,6 @@ static struct poptOption long_options[] = { {0, 0, 0, 0, 0, 0, 0} }; -/* - * usage - */ -static void usage(FILE *ofp) -{ - fprintf(ofp, "usage: lttng list [OPTIONS] [SESSION [SESSION OPTIONS]]\n"); - fprintf(ofp, "\n"); - fprintf(ofp, "With no arguments, list available tracing session(s)\n"); - fprintf(ofp, "\n"); - fprintf(ofp, "Without a session, -k lists available kernel events\n"); - fprintf(ofp, "Without a session, -u lists available userspace events\n"); - fprintf(ofp, "\n"); - fprintf(ofp, " -h, --help Show this help\n"); - fprintf(ofp, " --list-options Simple listing of options\n"); - fprintf(ofp, " -k, --kernel Select kernel domain\n"); - fprintf(ofp, " -u, --userspace Select user-space domain.\n"); - fprintf(ofp, " -j, --jul Apply for Java application using JUL\n"); - fprintf(ofp, " -l, --log4j Apply for Java application using LOG4J\n"); - fprintf(ofp, " -p, --python Apply for Python application using logging\n"); - fprintf(ofp, " -f, --fields List event fields.\n"); - fprintf(ofp, " --syscall List available system calls.\n"); - fprintf(ofp, "\n"); - fprintf(ofp, "Session Options:\n"); - fprintf(ofp, " -c, --channel NAME List details of a channel\n"); - fprintf(ofp, " -d, --domain List available domain(s)\n"); - fprintf(ofp, "\n"); -} - /* * Get command line from /proc for a specific pid. * @@ -211,9 +192,9 @@ static char *get_exclusion_names_msg(struct lttng_event *event) int exclusion_count; char *exclusion_msg = NULL; char *at; - int count; 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) { @@ -234,15 +215,12 @@ static char *get_exclusion_names_msg(struct lttng_event *event) */ exclusion_msg = malloc(exclusion_count + exclusion_count * LTTNG_SYMBOL_NAME_LEN + - strlen(exclusion_fmt) + 1); + exclusion_fmt_len + 1); if (!exclusion_msg) { goto end; } - at = exclusion_msg; - count = sprintf(at, exclusion_fmt); - at += count; - + at = strcpy(exclusion_msg, exclusion_fmt) + exclusion_fmt_len; for (i = 0; i < exclusion_count; ++i) { const char *name; @@ -261,12 +239,11 @@ static char *get_exclusion_names_msg(struct lttng_event *event) } /* Append exclusion name */ - count = sprintf(at, "%s", name); - at += count; + at += sprintf(at, "%s", name); } /* This also puts a final '\0' at the end of exclusion_msg */ - sprintf(at, "]"); + strcpy(at, "]"); end: return exclusion_msg; @@ -282,7 +259,7 @@ static void print_events(struct lttng_event *event) char *filter_msg = NULL; char *exclusion_msg = NULL; - ret = lttng_event_get_filter_string(event, &filter_str); + ret = lttng_event_get_filter_expression(event, &filter_str); if (ret) { filter_msg = strdup(" [failed to retrieve filter]"); @@ -354,10 +331,11 @@ static void print_events(struct lttng_event *event) MSG("%ssymbol: \"%s\"", indent8, event->attr.ftrace.symbol_name); break; case LTTNG_EVENT_SYSCALL: - MSG("%s%s%s%s%s", indent6, event->name, + MSG("%s%s%s%s%s%s", indent6, event->name, (opt_syscall ? "" : " (type:syscall)"), enabled_string(event->enabled), - bitness_event(event->flags)); + bitness_event(event->flags), + safe_string(filter_msg)); break; case LTTNG_EVENT_NOOP: MSG("%s (type: noop)%s%s", indent6, @@ -652,6 +630,8 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count, int event_element_open = 0; struct lttng_event cur_event; + memset(&cur_event, 0, sizeof(cur_event)); + /* Open domains element */ ret = mi_lttng_domains_open(writer); if (ret) { @@ -674,7 +654,6 @@ static int mi_list_ust_event_fields(struct lttng_event_field *fields, int count, if (cur_pid != fields[i].event.pid) { if (pid_element_open) { if (event_element_open) { - /* Close the previous field element and event. */ ret = mi_lttng_close_multi_element(writer, 2); if (ret) { @@ -1076,7 +1055,8 @@ static int list_session_agent_events(void) char *filter_msg = NULL; struct lttng_event *event = &events[i]; - ret = lttng_event_get_filter_string(event, &filter_str); + ret = lttng_event_get_filter_expression(event, + &filter_str); if (ret) { filter_msg = strdup(" [failed to retrieve filter]"); } else if (filter_str) { @@ -1086,8 +1066,8 @@ static int list_session_agent_events(void) filter_msg = malloc(strlen(filter_str) + strlen(filter_fmt) + 1); if (filter_msg) { - sprintf(filter_msg, " [filter: '%s']", - filter_str); + sprintf(filter_msg, filter_fmt, + filter_str); } } @@ -1194,16 +1174,50 @@ error: */ static void print_channel(struct lttng_channel *channel) { + int ret; + uint64_t discarded_events, lost_packets, monitor_timer_interval; + int64_t blocking_timeout; + + ret = lttng_channel_get_discarded_event_count(channel, + &discarded_events); + if (ret) { + ERR("Failed to retrieve discarded event count of channel"); + return; + } + + ret = lttng_channel_get_lost_packet_count(channel, + &lost_packets); + if (ret) { + ERR("Failed to retrieve lost packet count of channel"); + return; + } + + ret = lttng_channel_get_monitor_timer_interval(channel, + &monitor_timer_interval); + if (ret) { + ERR("Failed to retrieve monitor interval of channel"); + return; + } + + ret = lttng_channel_get_blocking_timeout(channel, + &blocking_timeout); + if (ret) { + ERR("Failed to retrieve blocking timeout of channel"); + return; + } + MSG("- %s:%s\n", channel->name, enabled_string(channel->enabled)); MSG("%sAttributes:", indent4); MSG("%soverwrite mode: %d", indent6, channel->attr.overwrite); - MSG("%ssubbufers size: %" PRIu64, indent6, channel->attr.subbuf_size); - MSG("%snumber of subbufers: %" PRIu64, indent6, channel->attr.num_subbuf); - MSG("%sswitch timer interval: %u", indent6, channel->attr.switch_timer_interval); - MSG("%sread timer interval: %u", indent6, channel->attr.read_timer_interval); + MSG("%ssubbuffers size: %" PRIu64 " bytes", indent6, channel->attr.subbuf_size); + MSG("%snumber of subbuffers: %" PRIu64, indent6, channel->attr.num_subbuf); + MSG("%sswitch timer interval: %u µs", indent6, channel->attr.switch_timer_interval); + MSG("%sread timer interval: %u µs", indent6, channel->attr.read_timer_interval); + MSG("%smonitor timer interval: %" PRIu64 " µs", indent6, monitor_timer_interval); + MSG("%sblocking timeout: %" PRId64 " µs", indent6, blocking_timeout); MSG("%strace file count: %" PRIu64, indent6, channel->attr.tracefile_count); - MSG("%strace file size (bytes): %" PRIu64, indent6, channel->attr.tracefile_size); + MSG("%strace file size: %" PRIu64 " bytes", indent6, channel->attr.tracefile_size); switch (channel->attr.output) { case LTTNG_EVENT_SPLICE: MSG("%soutput: splice()", indent6); @@ -1212,6 +1226,31 @@ static void print_channel(struct lttng_channel *channel) MSG("%soutput: mmap()", indent6); break; } + + if (!listed_session.snapshot_mode) { + /* + * The lost packet count is omitted for sessions in snapshot + * mode as it is misleading: it would indicate the number of + * packets that the consumer could not extract during the + * course of recording the snapshot. It does not have the + * same meaning as the "regular" lost packet count that + * would result from the consumer not keeping up with + * event production in an overwrite-mode channel. + * + * A more interesting statistic would be the number of + * packets lost between the first and last extracted + * packets of a given snapshot (which prevents most analyses). + */ + goto skip_stats_printing; + } + + if (!channel->attr.overwrite) { + MSG("%sdiscarded events: %" PRIu64, indent6, discarded_events); + } else { + MSG("%slost packets: %" PRIu64, indent6, lost_packets); + } +skip_stats_printing: + return; } /* @@ -1571,6 +1610,8 @@ static int list_sessions(const char *session_name) active_string(sessions[i].enabled), snapshot_string(sessions[i].snapshot_mode)); MSG("%sTrace path: %s\n", indent4, sessions[i].path); + memcpy(&listed_session, &sessions[i], + sizeof(listed_session)); break; } } else { @@ -1580,7 +1621,7 @@ static int list_sessions(const char *session_name) snapshot_string(sessions[i].snapshot_mode)); MSG("%sTrace path: %s", indent4, sessions[i].path); if (sessions[i].live_timer_interval != 0) { - MSG("%sLive timer interval (usec): %u", indent4, + MSG("%sLive timer interval: %u µs", indent4, sessions[i].live_timer_interval); } MSG(""); @@ -1709,7 +1750,6 @@ int cmd_list(int argc, const char **argv) memset(&domain, 0, sizeof(domain)); if (argc < 1) { - usage(stderr); ret = CMD_ERROR; goto end; } @@ -1720,7 +1760,7 @@ int cmd_list(int argc, const char **argv) while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { case OPT_HELP: - usage(stdout); + SHOW_HELP(); goto end; case OPT_USERSPACE: opt_userspace = 1; @@ -1729,7 +1769,6 @@ int cmd_list(int argc, const char **argv) list_cmd_options(stdout, long_options); goto end; default: - usage(stderr); ret = CMD_UNDEFINED; goto end; }