}
}
+static
+const char *loglevel_string_pre(const char *loglevel)
+{
+ if (loglevel[0] == '\0')
+ return "";
+ else
+ return " (loglevel: ";
+}
+
+static
+const char *loglevel_string_post(const char *loglevel)
+{
+ if (loglevel[0] == '\0')
+ return "";
+ else
+ return ")";
+}
+
/*
* Pretty print single event.
*/
{
switch (event->type) {
case LTTNG_EVENT_TRACEPOINT:
- MSG("%s%s (type: tracepoint)%s", indent6,
- event->name, enabled_string(event->enabled));
+ MSG("%s%s%s%s%s (type: tracepoint)%s", indent6,
+ event->name,
+ loglevel_string_pre(event->loglevel),
+ event->loglevel,
+ loglevel_string_post(event->loglevel),
+ enabled_string(event->enabled));
break;
case LTTNG_EVENT_PROBE:
MSG("%s%s (type: probe)%s", indent6,
MSG("%s (type: noop)%s", indent6,
enabled_string(event->enabled));
break;
+ case LTTNG_EVENT_TRACEPOINT_LOGLEVEL:
+ MSG("%s%s (type: tracepoint loglevel)%s", indent6,
+ event->name, enabled_string(event->enabled));
+ break;
case LTTNG_EVENT_ALL:
/* We should never have "all" events in list. */
assert(0);
MSG("\n%sEvents:", indent4);
if (count == 0) {
- MSG("%sNone", indent6);
+ MSG("%sNone\n", indent6);
goto end;
}
int cmd_list(int argc, const char **argv)
{
int opt, i, ret = CMD_SUCCESS;
- unsigned int nb_domain;
+ int nb_domain;
const char *session_name;
static poptContext pc;
struct lttng_domain domain;