From 1aef21b691d27775c8a4ab6d7cd40a850f62d24f Mon Sep 17 00:00:00 2001 From: David Goulet Date: Fri, 29 Jul 2011 11:15:20 -0400 Subject: [PATCH] Fix multiple enable events The session name was not set after the first event enabled. Signed-off-by: David Goulet --- lttng/commands/enable_events.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c index f5e243156..5d025e708 100644 --- a/lttng/commands/enable_events.c +++ b/lttng/commands/enable_events.c @@ -162,11 +162,6 @@ static int enable_events(void) struct lttng_event ev; struct lttng_domain dom; - if (set_session_name(opt_session_name) < 0) { - ret = CMD_ERROR; - goto error; - } - if (opt_channel_name == NULL) { err = asprintf(&channel_name, DEFAULT_CHANNEL_NAME); if (err < 0) { @@ -183,6 +178,11 @@ static int enable_events(void) } if (opt_enable_all) { + if (set_session_name(opt_session_name) < 0) { + ret = CMD_ERROR; + goto error; + } + if (opt_kernel) { ret = lttng_enable_event(&dom, NULL, channel_name); if (ret == 0) { @@ -197,6 +197,11 @@ static int enable_events(void) /* Strip event list */ event_name = strtok(opt_event_list, ","); while (event_name != NULL) { + if (set_session_name(opt_session_name) < 0) { + ret = CMD_ERROR; + goto error; + } + /* Kernel tracer action */ if (opt_kernel) { DBG("Enabling kernel event %s for channel %s", -- 2.34.1