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

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 67b2e77f4..803a88090 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) {
@@ -784,17 +784,17 @@ static int add_uri_to_consumer(struct consumer_output *consumer,
 		break;
 	case LTTNG_DST_PATH:
 		DBG2("Setting trace directory path from URI to %s", uri->dst.path);
-		memset(consumer->dst.trace_path, 0,
-				sizeof(consumer->dst.trace_path));
+		memset(consumer->dst.session_root_path, 0,
+				sizeof(consumer->dst.session_root_path));
 		/* Explicit length checks for strcpy and strcat. */
 		if (strlen(uri->dst.path) + strlen(default_trace_dir)
-				>= sizeof(consumer->dst.trace_path)) {
+				>= sizeof(consumer->dst.session_root_path)) {
 			ret = LTTNG_ERR_FATAL;
 			goto error;
 		}
-		strcpy(consumer->dst.trace_path, uri->dst.path);
+		strcpy(consumer->dst.session_root_path, uri->dst.path);
 		/* Append default trace dir */
-		strcat(consumer->dst.trace_path, default_trace_dir);
+		strcat(consumer->dst.session_root_path, default_trace_dir);
 		/* Flag consumer as local. */
 		consumer->type = CONSUMER_DST_LOCAL;
 		break;
@@ -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;
@@ -3086,7 +3099,7 @@ void cmd_list_lttng_sessions(struct lttng_session *sessions, uid_t uid,
 					sizeof(sessions[i].path), session);
 		} else {
 			ret = snprintf(sessions[i].path, sizeof(sessions[i].path), "%s",
-					session->consumer->dst.trace_path);
+					session->consumer->dst.session_root_path);
 		}
 		if (ret < 0) {
 			PERROR("snprintf session path");
@@ -3323,7 +3336,7 @@ ssize_t cmd_snapshot_list_outputs(struct ltt_session *session,
 		}
 		if (output->consumer->type == CONSUMER_DST_LOCAL) {
 			if (lttng_strncpy(list[idx].ctrl_url,
-					output->consumer->dst.trace_path,
+					output->consumer->dst.session_root_path,
 					sizeof(list[idx].ctrl_url))) {
 				ret = -LTTNG_ERR_INVALID;
 				goto error;