From 67b5863058c0fbe14e0b527013b50aef8eabdd88 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 13 Nov 2013 15:43:58 -0500 Subject: [PATCH] Fix: Warn that kernel loglevels are unsupported MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Warn the user when the log level option is used when the kernel domain is selected. Also, don't show the log level in the confirmation message when kernel events are selected. Fixes Bug #645 Signed-off-by: Jérémie Galarneau Signed-off-by: David Goulet --- src/bin/lttng/commands/enable_events.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c index a7b70c3f9..2dff63b92 100644 --- a/src/bin/lttng/commands/enable_events.c +++ b/src/bin/lttng/commands/enable_events.c @@ -346,6 +346,9 @@ static int enable_events(char *session_name) ret = CMD_ERROR; goto error; } + if (opt_loglevel) { + WARN("Kernel loglevels are not supported."); + } } /* Create lttng domain */ @@ -419,7 +422,7 @@ static int enable_events(char *session_name) switch (opt_event_type) { case LTTNG_EVENT_TRACEPOINT: - if (opt_loglevel) { + if (opt_loglevel && dom.type != LTTNG_DOMAIN_KERNEL) { MSG("All %s tracepoints are enabled in channel %s for loglevel %s", get_domain_str(dom.type), print_channel_name(channel_name), @@ -428,7 +431,6 @@ static int enable_events(char *session_name) MSG("All %s tracepoints are enabled in channel %s", get_domain_str(dom.type), print_channel_name(channel_name)); - } break; case LTTNG_EVENT_SYSCALL: @@ -438,7 +440,7 @@ static int enable_events(char *session_name) } break; case LTTNG_EVENT_ALL: - if (opt_loglevel) { + if (opt_loglevel && dom.type != LTTNG_DOMAIN_KERNEL) { MSG("All %s events are enabled in channel %s for loglevel %s", get_domain_str(dom.type), print_channel_name(channel_name), @@ -533,12 +535,6 @@ static int enable_events(char *session_name) goto error; } - if (opt_loglevel) { - MSG("Kernel loglevels are not supported."); - ret = CMD_UNSUPPORTED; - goto error; - } - /* kernel loglevels not implemented */ ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL; } else if (opt_userspace) { /* User-space tracer action */ -- 2.34.1