X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=c17be934af50f6a589b7e1feef51fddbd70dbcea;hp=577647a1c074597ecd7935e5e3d1e3a37e2d9b32;hb=885e05c50f81e77fc3a14a36064c4ef702127cd7;hpb=46ef21888c975515837d5dab104c938c424792ed

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 577647a1c..c17be934a 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -912,6 +912,10 @@ static enum lttng_error_code add_uri_to_consumer(
 		ret = lttng_strncpy(consumer->dst.session_root_path,
 				uri->dst.path,
 				sizeof(consumer->dst.session_root_path));
+		if (ret) {
+			ret_code = LTTNG_ERR_FATAL;
+			goto error;
+		}
 		consumer->type = CONSUMER_DST_LOCAL;
 		break;
 	}
@@ -1252,7 +1256,7 @@ error:
 /*
  * Start a kernel session by opening all necessary streams.
  */
-static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
+static int start_kernel_session(struct ltt_kernel_session *ksess)
 {
 	int ret;
 	struct ltt_kernel_channel *kchan;
@@ -1304,7 +1308,7 @@ static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
 	}
 
 	/* Quiescent wait after starting trace */
-	kernel_wait_quiescent(wpipe);
+	kernel_wait_quiescent();
 
 	ksess->active = 1;
 
@@ -1336,7 +1340,7 @@ int cmd_disable_channel(struct ltt_session *session,
 			goto error;
 		}
 
-		kernel_wait_quiescent(kernel_tracer_fd);
+		kernel_wait_quiescent();
 		break;
 	}
 	case LTTNG_DOMAIN_UST:
@@ -1394,7 +1398,7 @@ int cmd_track_pid(struct ltt_session *session, enum lttng_domain_type domain,
 			goto error;
 		}
 
-		kernel_wait_quiescent(kernel_tracer_fd);
+		kernel_wait_quiescent();
 		break;
 	}
 	case LTTNG_DOMAIN_UST:
@@ -1445,7 +1449,7 @@ int cmd_untrack_pid(struct ltt_session *session, enum lttng_domain_type domain,
 			goto error;
 		}
 
-		kernel_wait_quiescent(kernel_tracer_fd);
+		kernel_wait_quiescent();
 		break;
 	}
 	case LTTNG_DOMAIN_UST:
@@ -1525,7 +1529,7 @@ int cmd_enable_channel(struct ltt_session *session,
 	switch (domain->type) {
 	case LTTNG_DOMAIN_KERNEL:
 	{
-		if (kernel_supports_ring_buffer_snapshot_sample_positions(kernel_tracer_fd) != 1) {
+		if (kernel_supports_ring_buffer_snapshot_sample_positions() != 1) {
 			/* Sampling position of buffer is not supported */
 			WARN("Kernel tracer does not support buffer monitoring. "
 					"Setting the monitor interval timer to 0 "
@@ -1576,7 +1580,7 @@ int cmd_enable_channel(struct ltt_session *session,
 			goto error;
 		}
 
-		kernel_wait_quiescent(kernel_tracer_fd);
+		kernel_wait_quiescent();
 		break;
 	}
 	case LTTNG_DOMAIN_UST:
@@ -1711,7 +1715,7 @@ int cmd_disable_event(struct ltt_session *session,
 			goto error_unlock;
 		}
 
-		kernel_wait_quiescent(kernel_tracer_fd);
+		kernel_wait_quiescent();
 		break;
 	}
 	case LTTNG_DOMAIN_UST:
@@ -2161,7 +2165,7 @@ static int _cmd_enable_event(struct ltt_session *session,
 			goto error;
 		}
 
-		kernel_wait_quiescent(kernel_tracer_fd);
+		kernel_wait_quiescent();
 		break;
 	}
 	case LTTNG_DOMAIN_UST:
@@ -2429,7 +2433,7 @@ ssize_t cmd_list_tracepoints(enum lttng_domain_type domain,
 
 	switch (domain) {
 	case LTTNG_DOMAIN_KERNEL:
-		nb_events = kernel_list_events(kernel_tracer_fd, events);
+		nb_events = kernel_list_events(events);
 		if (nb_events < 0) {
 			ret = LTTNG_ERR_KERN_LIST_FAIL;
 			goto error;
@@ -2588,8 +2592,7 @@ int cmd_start_trace(struct ltt_session *session)
 		goto error;
 	}
 
-	if (session->output_traces && !session->current_trace_chunk &&
-			session_output_supports_trace_chunks(session)) {
+	if (session->output_traces && !session->current_trace_chunk) {
 		struct lttng_trace_chunk *trace_chunk;
 
 		trace_chunk = session_create_new_trace_chunk(
@@ -2610,7 +2613,7 @@ int cmd_start_trace(struct ltt_session *session)
 	/* Kernel tracing */
 	if (ksession != NULL) {
 		DBG("Start kernel tracing session %s", session->name);
-		ret = start_kernel_session(ksession, kernel_tracer_fd);
+		ret = start_kernel_session(ksession);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -2687,13 +2690,14 @@ int cmd_stop_trace(struct ltt_session *session)
 			goto error;
 		}
 
-		kernel_wait_quiescent(kernel_tracer_fd);
+		kernel_wait_quiescent();
 
 		/* Flush metadata after stopping (if exists) */
 		if (ksession->metadata_stream_fd >= 0) {
 			ret = kernel_metadata_flush_buffer(ksession->metadata_stream_fd);
 			if (ret < 0) {
 				ERR("Kernel metadata flush failed");
+				error_occurred = true;
 			}
 		}
 
@@ -2702,6 +2706,7 @@ int cmd_stop_trace(struct ltt_session *session)
 			ret = kernel_flush_buffer(kchan);
 			if (ret < 0) {
 				ERR("Kernel flush buffer error");
+				error_occurred = true;
 			}
 		}
 
@@ -3199,8 +3204,7 @@ int cmd_destroy_session(struct ltt_session *session,
                 if (reply_context) {
 			reply_context->implicit_rotation_on_destroy = true;
                 }
-        } else if (session->has_been_started && session->current_trace_chunk &&
-				session_output_supports_trace_chunks(session)) {
+        } else if (session->has_been_started && session->current_trace_chunk) {
 		/*
 		 * The user has not triggered a session rotation. However, to
 		 * ensure all data has been consumed, the session is rotated
@@ -4478,6 +4482,8 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 				session->kernel_session->consumer;
 		snapshot_kernel_consumer_output =
 				consumer_copy_output(snapshot_output->consumer);
+		strcpy(snapshot_kernel_consumer_output->chunk_path,
+			snapshot_chunk_name);
 		ret = consumer_copy_sockets(snapshot_kernel_consumer_output,
 				original_kernel_consumer_output);
 		if (ret < 0) {
@@ -4498,6 +4504,8 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 		original_ust_consumer_output = session->ust_session->consumer;
 		snapshot_ust_consumer_output =
 				consumer_copy_output(snapshot_output->consumer);
+		strcpy(snapshot_ust_consumer_output->chunk_path,
+			snapshot_chunk_name);
 		ret = consumer_copy_sockets(snapshot_ust_consumer_output,
 				original_ust_consumer_output);
 		if (ret < 0) {
@@ -4564,7 +4572,7 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 	}
 
 	if (session_close_trace_chunk(
-			    session, session->current_trace_chunk, NULL)) {
+			    session, session->current_trace_chunk, NULL, NULL)) {
 		/*
 		 * Don't goto end; make sure the chunk is closed for the session
 		 * to allow future snapshots.
@@ -4787,7 +4795,7 @@ int cmd_rotate_session(struct ltt_session *session,
 	}
 
 	/* Unsupported feature in lttng-relayd before 2.11. */
-	if (session->consumer->type == CONSUMER_DST_NET &&
+	if (!quiet_rotation && session->consumer->type == CONSUMER_DST_NET &&
 			(session->consumer->relay_major_version == 2 &&
 			session->consumer->relay_minor_version < 11)) {
 		cmd_ret = LTTNG_ERR_ROTATION_NOT_AVAILABLE_RELAY;
@@ -4853,7 +4861,8 @@ int cmd_rotate_session(struct ltt_session *session,
 			quiet_rotation ?
 					NULL :
 					&((enum lttng_trace_chunk_command_type){
-							LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED}));
+							LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED}),
+			session->last_chunk_path);
 	if (ret) {
 		cmd_ret = LTTNG_ERR_CLOSE_TRACE_CHUNK_FAIL_CONSUMER;
 		goto error;
@@ -4974,8 +4983,21 @@ int cmd_rotate_get_info(struct ltt_session *session,
 					sizeof(info_return->location.local.absolute_path);
 			info_return->location_type =
 					(int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL;
+			fmt_ret = asprintf(&chunk_path,
+					"%s/" DEFAULT_ARCHIVED_TRACE_CHUNKS_DIRECTORY "/%s",
+					session_get_base_path(session),
+					session->last_archived_chunk_name);
+			if (fmt_ret == -1) {
+				PERROR("Failed to format the path of the last archived trace chunk");
+				info_return->status = LTTNG_ROTATION_STATUS_ERROR;
+				cmd_ret = LTTNG_ERR_UNK;
+				goto end;
+			}
 			break;
 		case CONSUMER_DST_NET:
+		{
+			uint16_t ctrl_port, data_port;
+
 			current_tracing_path_reply =
 					info_return->location.relay.relative_path;
 			current_tracing_path_reply_len =
@@ -4994,25 +5016,23 @@ int cmd_rotate_get_info(struct ltt_session *session,
 				goto end;
 			}
 
-			session_get_net_consumer_ports(session,
-					&info_return->location.relay.ports.control,
-					&info_return->location.relay.ports.data);
+			session_get_net_consumer_ports(session, &ctrl_port, &data_port);
+			info_return->location.relay.ports.control = ctrl_port;
+			info_return->location.relay.ports.data = data_port;
 			info_return->location_type =
 					(int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY;
+			chunk_path = strdup(session->last_chunk_path);
+			if (!chunk_path) {
+				ERR("Failed to allocate the path of the last archived trace chunk");
+				info_return->status = LTTNG_ROTATION_STATUS_ERROR;
+				cmd_ret = LTTNG_ERR_UNK;
+				goto end;
+			}
 			break;
+		}
 		default:
 			abort();
 		}
-		fmt_ret = asprintf(&chunk_path,
-				"%s/" DEFAULT_ARCHIVED_TRACE_CHUNKS_DIRECTORY "/%s",
-				session_get_base_path(session),
-				session->last_archived_chunk_name);
-		if (fmt_ret == -1) {
-			PERROR("Failed to format the path of the last archived trace chunk");
-			info_return->status = LTTNG_ROTATION_STATUS_ERROR;
-			cmd_ret = LTTNG_ERR_UNK;
-			goto end;
-		}
 
 		fmt_ret = lttng_strncpy(current_tracing_path_reply,
 				chunk_path, current_tracing_path_reply_len);