X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=82d92070398119fd60fce36adb55d17eb2aafc19;hp=48aa79298c3d9bae6775c5db8767651d6f9ba75d;hb=7d268848fe44e591c53c8dfce796c6503c4539e8;hpb=ecd1a12fac39784bded85c0f06e47ace2dc98cde

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 48aa79298..82d920703 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1252,7 +1252,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 +1304,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 +1336,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 +1394,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 +1445,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 +1525,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 +1576,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 +1711,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 +2161,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 +2429,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;
@@ -2609,7 +2609,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;
 		}
@@ -2686,7 +2686,7 @@ 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) {
@@ -4476,6 +4476,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) {
@@ -4496,6 +4498,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) {