* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <inttypes.h>
#include <popt.h>
}
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)
}
}
+/*
+ * 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:
{
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 {
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 {
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:
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)
goto end;
}
- /* Open processes element */
- ret = mi_lttng_processes_open(writer);
+ /* Open pids element element */
+ ret = mi_lttng_pids_open(writer);
if (ret) {
goto end;
}
if (!pid_element_open) {
/* Open and write a pid element */
- ret = mi_lttng_process(writer, cur_pid, cmdline, 1);
+ ret = mi_lttng_pid(writer, cur_pid, cmdline, 1);
if (ret) {
goto error;
}
}
}
- /* Close processes */
+ /* Close pids */
ret = mi_lttng_writer_close_element(writer);
if (ret) {
goto end;
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;
goto end;
}
- /* Open processes element */
- ret = mi_lttng_processes_open(writer);
+ /* Open pids element */
+ ret = mi_lttng_pids_open(writer);
if (ret) {
goto end;
}
cur_pid = fields[i].event.pid;
cmdline = get_cmdline_by_pid(cur_pid);
if (!pid_element_open) {
- /* Open and write a process element */
- ret = mi_lttng_process(writer, cur_pid, cmdline, 1);
+ /* Open and write a pid element */
+ ret = mi_lttng_pid(writer, cur_pid, cmdline, 1);
if (ret) {
goto error;
}
}
}
- /* Close processes, domain, domains */
+ /* Close pid, domain, domains */
ret = mi_lttng_close_multi_element(writer, 3);
end:
return ret;
}
for (i = 0; i < count; i++) {
- if (events[i].loglevel_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)", indent4,
- events[i].name,
- enabled_string(
- events[i].enabled),
+ MSG("%s- %s%s (loglevel%s %s)%s", indent4,
+ event->name,
+ enabled_string(event->enabled),
logleveltype_string(
- events[i].loglevel_type),
+ event->loglevel_type),
mi_lttng_loglevel_string(
- events[i].loglevel,
- handle->domain.type));
+ event->loglevel,
+ handle->domain.type),
+ safe_string(filter_msg));
} else {
- MSG("%s- %s%s", indent4, events[i].name,
- enabled_string(events[i].enabled));
+ MSG("%s- %s%s%s", indent4, event->name,
+ enabled_string(event->enabled),
+ safe_string(filter_msg));
}
+ free(filter_msg);
}
MSG("");
if (ret) {
goto end;
}
- continue;
+
+ goto next_domain;
}
switch (domains[i].type) {
goto end;
}
+next_domain:
if (lttng_opt_mi) {
/* Close domain element */
ret = mi_lttng_writer_close_element(writer);
projects / lttng-tools.git / blobdiff