From 6a8e0c672ab0f8e771c24a9f331ade21c359af70 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 23 Apr 2019 14:40:05 -0400 Subject: [PATCH] Fix: use DEFAULT_SESSION_NAME when name was generated Signed-off-by: Jonathan Rajotte --- src/bin/lttng-sessiond/kernel.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c index 251d93456..cedb9346c 100644 --- a/src/bin/lttng-sessiond/kernel.c +++ b/src/bin/lttng-sessiond/kernel.c @@ -125,14 +125,24 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd) DBG("Kernel session created (fd: %d)", lks->fd); - ret = kernctl_session_set_name(lks->fd, session->name); + /* + * This is necessary since the creation time is present in the session + * name when it is generated. + */ + if (session->has_auto_generated_name) { + ret = kernctl_session_set_name(lks->fd, DEFAULT_SESSION_NAME); + } else { + ret = kernctl_session_set_name(lks->fd, session->name); + } if (ret) { - WARN("Could not set kernel session name"); + WARN("Could not set kernel session name for session %" PRIu64 " name: %s", + session->id, session->name); } ret = kernctl_session_set_creation_time(lks->fd, session->creation_time); if (ret) { - WARN("Could not set kernel session creation time"); + WARN("Could not set kernel session creation time for session %" PRIu64 " name: %s", + session->id, session->name); } return 0; -- 2.34.1