const char *active_string(int value)
{
switch (value) {
- case 0: return " [active]";
- case 1: return " [inactive]";
+ case 0: return " [inactive]";
+ case 1: return " [active]";
case -1: return "";
default: return NULL;
}
const char *enabled_string(int value)
{
switch (value) {
- case 0: return " [enabled]";
- case 1: return " [disabled]";
+ case 0: return " [disabled]";
+ case 1: return " [enabled]";
case -1: return "";
default: return NULL;
}
}
+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));
+ {
+ char ll_value[LTTNG_SYMBOL_NAME_LEN] = "";
+
+ if (event->loglevel[0] != '\0') {
+ int ret;
+
+ ret = snprintf(ll_value, LTTNG_SYMBOL_NAME_LEN,
+ ", %lld", (long long) event->loglevel_value);
+ if (ret < 0)
+ ERR("snprintf error");
+ }
+ MSG("%s%s%s%s%s%s (type: tracepoint)%s", indent6,
+ event->name,
+ loglevel_string_pre(event->loglevel),
+ event->loglevel,
+ ll_value,
+ loglevel_string_post(event->loglevel),
+ enabled_string(event->enabled));
break;
+ }
case LTTNG_EVENT_PROBE:
MSG("%s%s (type: probe)%s", indent6,
event->name, enabled_string(event->enabled));
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;
}
unsigned int chan_found = 0;
struct lttng_channel *channels = NULL;
- DBG("Listing channel(s) (%s)", channel_name);
+ DBG("Listing channel(s) (%s)", channel_name ? : "<all>");
count = lttng_list_channels(handle, &channels);
if (count < 0) {
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;