X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=2c1ae3f5132ea3e8a0031dfe6525af733926c535;hb=bcd52dd90f07cc4cf4eebf32761568a2c03c540a;hp=67b2e77f49c34ff690bf9467ad975c95c85ef59c;hpb=ecd0f96d0a98fde1e7760a8ec80df8e792a8cbcc;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 67b2e77f4..2c1ae3f51 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -167,14 +167,14 @@ static int get_kernel_runtime_stats(struct ltt_session *session,
 		goto end;
 	}
 
-	ret = consumer_get_discarded_events(session->id, kchan->fd,
+	ret = consumer_get_discarded_events(session->id, kchan->key,
 			session->kernel_session->consumer,
 			discarded_events);
 	if (ret < 0) {
 		goto end;
 	}
 
-	ret = consumer_get_lost_packets(session->id, kchan->fd,
+	ret = consumer_get_lost_packets(session->id, kchan->key,
 			session->kernel_session->consumer,
 			lost_packets);
 	if (ret < 0) {
@@ -877,8 +877,11 @@ static int create_connect_relayd(struct lttng_uri *uri,
 
 		/* Check relayd version */
 		ret = relayd_version_check(rsock);
-		if (ret < 0) {
-			ret = LTTNG_ERR_RELAYD_VERSION_FAIL;
+		if (ret == LTTNG_ERR_RELAYD_VERSION_FAIL) {
+			goto close_sock;
+		} else if (ret < 0) {
+			ERR("Unable to reach lttng-relayd");
+			ret = LTTNG_ERR_RELAYD_CONNECT_FAIL;
 			goto close_sock;
 		}
 		consumer->relay_major_version = rsock->major;
@@ -1654,6 +1657,16 @@ int cmd_add_context(struct ltt_session *session, enum lttng_domain_type domain,
 	int ret, chan_kern_created = 0, chan_ust_created = 0;
 	char *app_ctx_provider_name = NULL, *app_ctx_name = NULL;
 
+	/*
+	 * Don't try to add a context if the session has been started at
+	 * some point in time before. The tracer does not allow it and would
+	 * result in a corrupted trace.
+	 */
+	if (session->has_been_started) {
+		ret = LTTNG_ERR_TRACE_ALREADY_STARTED;
+		goto end;
+	}
+
 	if (ctx->ctx == LTTNG_EVENT_CONTEXT_APP_CONTEXT) {
 		app_ctx_provider_name = ctx->u.app_ctx.provider_name;
 		app_ctx_name = ctx->u.app_ctx.ctx_name;