From 8b08c525994646dcca4daa7c819c7899aa86055f Mon Sep 17 00:00:00 2001 From: Antoine Busque Date: Tue, 1 Sep 2015 19:48:43 -0400 Subject: [PATCH] Fix: fail gracefully on --exclude on unsupported domains MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Trying to use event name exclusions on unsupported domains other than kernel (i.e. log4j, jul, and python) would hang the client. Instead, report the error appropriately. Fixes: #909 Signed-off-by: Antoine Busque Signed-off-by: Jérémie Galarneau --- src/bin/lttng/commands/enable_events.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c index 0e4fdc61e..c13232a5a 100644 --- a/src/bin/lttng/commands/enable_events.c +++ b/src/bin/lttng/commands/enable_events.c @@ -726,10 +726,22 @@ static int enable_events(char *session_name) goto error; } - if (opt_kernel && opt_exclude) { - ERR("Event name exclusions are not yet implemented for kernel events"); - ret = CMD_ERROR; - goto error; + if (opt_exclude) { + switch (dom.type) { + case LTTNG_DOMAIN_KERNEL: + case LTTNG_DOMAIN_JUL: + case LTTNG_DOMAIN_LOG4J: + case LTTNG_DOMAIN_PYTHON: + ERR("Event name exclusions are not yet implemented for %s events", + get_domain_str(dom.type)); + ret = CMD_ERROR; + goto error; + case LTTNG_DOMAIN_UST: + /* Exclusions supported */ + break; + default: + assert(0); + } } channel_name = opt_channel_name; -- 2.34.1