X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;fp=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=cedb9346cea81d29fc8eb547bbcbe769c337cc38;hp=251d934560dce04fbcaca8667d559d3d321485c4;hb=b2543b2047a84638b3c8eb8bb7babdc8824c0a94;hpb=da7587b7850040b371b3a588a9d84535ea6cf530

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;