From be5d04a69d871a17842af4cbf8421be7a9d5bbbb Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 8 Aug 2019 00:45:56 -0400 Subject: [PATCH] src.ctf.lttng-live fix: remove overly strict check for session name MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The live component checks that the path of a stream contains a session's name. While this check works when interacting with pre-2.11 peers, there is no reason for a session's name to necessarily be in a stream's path. The LTTng relay daemon, as of 2.11, now expresses its path relative to a session's output path, the session's name no longer appears in a stream's path. There are no comments explaining the reason for this check and it is not present in babeltrace 1.5.x. Hence, it appears safe to remove it. Signed-off-by: Jérémie Galarneau Change-Id: Ic5499976ed45f1f4ae17056b9e881a8455898a44 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1845 Reviewed-by: Philippe Proulx --- src/plugins/ctf/lttng-live/metadata.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/plugins/ctf/lttng-live/metadata.c b/src/plugins/ctf/lttng-live/metadata.c index 910bbf0c..db1dfd7d 100644 --- a/src/plugins/ctf/lttng-live/metadata.c +++ b/src/plugins/ctf/lttng-live/metadata.c @@ -283,7 +283,6 @@ int lttng_live_metadata_create_stream(struct lttng_live_session *session, { struct lttng_live_metadata *metadata = NULL; struct lttng_live_trace *trace; - const char *match; struct ctf_metadata_decoder_config cfg = { .log_level = session->log_level, .self_comp = session->self_comp, @@ -299,11 +298,6 @@ int lttng_live_metadata_create_stream(struct lttng_live_session *session, metadata->self_comp = session->self_comp; metadata->stream_id = stream_id; - match = strstr(trace_name, session->session_name->str); - if (!match) { - goto error; - } - metadata->decoder = ctf_metadata_decoder_create(&cfg); if (!metadata->decoder) { goto error; -- 2.34.1