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);
}
/* 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 */
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]");
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,
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) {
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);
}
}
*/
static void print_channel(struct lttng_channel *channel)
{
+ int ret;
+ uint64_t discarded_events, lost_packets;
+
+ 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;
+ }
+
MSG("- %s:%s\n", channel->name, enabled_string(channel->enabled));
MSG("%sAttributes:", indent4);
MSG("%sread timer interval: %u", indent6, channel->attr.read_timer_interval);
MSG("%strace file count: %" PRIu64, indent6, channel->attr.tracefile_count);
MSG("%strace file size (bytes): %" PRIu64, indent6, channel->attr.tracefile_size);
+ MSG("%sdiscarded events: %" PRIu64, indent6, discarded_events);
+ MSG("%slost packets: %" PRIu64, indent6, lost_packets);
switch (channel->attr.output) {
case LTTNG_EVENT_SPLICE:
MSG("%soutput: splice()", indent6);