X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=c2231f1b07f128de561fd1849ed845c00fc91483;hp=1b73978f27f0e81d671987f05ae851e70e5acf47;hb=df4f5a87a21110a5f9447bcfd7ffeb25098a5fd4;hpb=3b9677124ab48bddc945ca67947c49b87b5853e0

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 1b73978f2..c2231f1b0 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -107,7 +107,7 @@ static uint64_t relayd_net_seq_idx;
 
 static int validate_ust_event_name(const char *);
 static int cmd_enable_event_internal(struct ltt_session *session,
-		struct lttng_domain *domain,
+		const struct lttng_domain *domain,
 		char *channel_name, struct lttng_event *event,
 		char *filter_expression,
 		struct lttng_filter_bytecode *filter,
@@ -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:
@@ -1478,27 +1482,29 @@ error:
  * The wpipe arguments is used as a notifier for the kernel thread.
  */
 int cmd_enable_channel(struct ltt_session *session,
-		struct lttng_domain *domain, struct lttng_channel *attr, int wpipe)
+		const struct lttng_domain *domain, const struct lttng_channel *_attr, int wpipe)
 {
 	int ret;
 	struct ltt_ust_session *usess = session->ust_session;
 	struct lttng_ht *chan_ht;
 	size_t len;
+	struct lttng_channel attr;
 
 	assert(session);
-	assert(attr);
+	assert(_attr);
 	assert(domain);
 
-	len = lttng_strnlen(attr->name, sizeof(attr->name));
+	attr = *_attr;
+	len = lttng_strnlen(attr.name, sizeof(attr.name));
 
 	/* Validate channel name */
-	if (attr->name[0] == '.' ||
-		memchr(attr->name, '/', len) != NULL) {
+	if (attr.name[0] == '.' ||
+		memchr(attr.name, '/', len) != NULL) {
 		ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
 		goto end;
 	}
 
-	DBG("Enabling channel %s for session %s", attr->name, session->name);
+	DBG("Enabling channel %s for session %s", attr.name, session->name);
 
 	rcu_read_lock();
 
@@ -1517,21 +1523,21 @@ int cmd_enable_channel(struct ltt_session *session,
 	 * beacons for inactive streams.
 	 */
 	if (session->live_timer > 0) {
-		attr->attr.live_timer_interval = session->live_timer;
-		attr->attr.switch_timer_interval = 0;
+		attr.attr.live_timer_interval = session->live_timer;
+		attr.attr.switch_timer_interval = 0;
 	}
 
 	/* Check for feature support */
 	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 "
 					"(disabled) for channel '%s' of session '%s'",
-					attr-> name, session->name);
-			lttng_channel_set_monitor_timer_interval(attr, 0);
+					attr.name, session->name);
+			lttng_channel_set_monitor_timer_interval(&attr, 0);
 		}
 		break;
 	}
@@ -1556,16 +1562,16 @@ int cmd_enable_channel(struct ltt_session *session,
 	{
 		struct ltt_kernel_channel *kchan;
 
-		kchan = trace_kernel_get_channel_by_name(attr->name,
+		kchan = trace_kernel_get_channel_by_name(attr.name,
 				session->kernel_session);
 		if (kchan == NULL) {
 			if (session->snapshot.nb_output > 0 ||
 					session->snapshot_mode) {
 				/* Enforce mmap output for snapshot sessions. */
-				attr->attr.output = LTTNG_EVENT_MMAP;
+				attr.attr.output = LTTNG_EVENT_MMAP;
 			}
-			ret = channel_kernel_create(session->kernel_session, attr, wpipe);
-			if (attr->name[0] != '\0') {
+			ret = channel_kernel_create(session->kernel_session, &attr, wpipe);
+			if (attr.name[0] != '\0') {
 				session->kernel_session->has_non_default_channel = 1;
 			}
 		} else {
@@ -1576,7 +1582,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:
@@ -1595,19 +1601,19 @@ int cmd_enable_channel(struct ltt_session *session,
 		 * adhered to.
 		 */
 		if (domain->type == LTTNG_DOMAIN_JUL) {
-			if (strncmp(attr->name, DEFAULT_JUL_CHANNEL_NAME,
+			if (strncmp(attr.name, DEFAULT_JUL_CHANNEL_NAME,
 					LTTNG_SYMBOL_NAME_LEN)) {
 				ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
 				goto error;
 			}
 		} else if (domain->type == LTTNG_DOMAIN_LOG4J) {
-			if (strncmp(attr->name, DEFAULT_LOG4J_CHANNEL_NAME,
+			if (strncmp(attr.name, DEFAULT_LOG4J_CHANNEL_NAME,
 					LTTNG_SYMBOL_NAME_LEN)) {
 				ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
 				goto error;
 			}
 		} else if (domain->type == LTTNG_DOMAIN_PYTHON) {
-			if (strncmp(attr->name, DEFAULT_PYTHON_CHANNEL_NAME,
+			if (strncmp(attr.name, DEFAULT_PYTHON_CHANNEL_NAME,
 					LTTNG_SYMBOL_NAME_LEN)) {
 				ret = LTTNG_ERR_INVALID_CHANNEL_NAME;
 				goto error;
@@ -1616,10 +1622,10 @@ int cmd_enable_channel(struct ltt_session *session,
 
 		chan_ht = usess->domain_global.channels;
 
-		uchan = trace_ust_find_channel_by_name(chan_ht, attr->name);
+		uchan = trace_ust_find_channel_by_name(chan_ht, attr.name);
 		if (uchan == NULL) {
-			ret = channel_ust_create(usess, attr, domain->buf_type);
-			if (attr->name[0] != '\0') {
+			ret = channel_ust_create(usess, &attr, domain->buf_type);
+			if (attr.name[0] != '\0') {
 				usess->has_non_default_channel = 1;
 			}
 		} else {
@@ -1632,7 +1638,7 @@ int cmd_enable_channel(struct ltt_session *session,
 		goto error;
 	}
 
-	if (ret == LTTNG_OK && attr->attr.output != LTTNG_EVENT_MMAP) {
+	if (ret == LTTNG_OK && attr.attr.output != LTTNG_EVENT_MMAP) {
 		session->has_non_mmap_channel = true;
 	}
 error:
@@ -1645,11 +1651,11 @@ end:
  * Command LTTNG_DISABLE_EVENT processed by the client thread.
  */
 int cmd_disable_event(struct ltt_session *session,
-		enum lttng_domain_type domain, char *channel_name,
-		struct lttng_event *event)
+		enum lttng_domain_type domain, const char *channel_name,
+		const struct lttng_event *event)
 {
 	int ret;
-	char *event_name;
+	const char *event_name;
 
 	DBG("Disable event command for event \'%s\'", event->name);
 
@@ -1711,7 +1717,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:
@@ -1822,7 +1828,7 @@ error:
  * Command LTTNG_ADD_CONTEXT processed by the client thread.
  */
 int cmd_add_context(struct ltt_session *session, enum lttng_domain_type domain,
-		char *channel_name, struct lttng_event_context *ctx, int kwpipe)
+		char *channel_name, const struct lttng_event_context *ctx, int kwpipe)
 {
 	int ret, chan_kern_created = 0, chan_ust_created = 0;
 	char *app_ctx_provider_name = NULL, *app_ctx_name = NULL;
@@ -1993,7 +1999,7 @@ end:
  * enable the events through which all "agent" events are funeled.
  */
 static int _cmd_enable_event(struct ltt_session *session,
-		struct lttng_domain *domain,
+		const struct lttng_domain *domain,
 		char *channel_name, struct lttng_event *event,
 		char *filter_expression,
 		struct lttng_filter_bytecode *filter,
@@ -2161,7 +2167,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:
@@ -2390,7 +2396,8 @@ error:
  * Command LTTNG_ENABLE_EVENT processed by the client thread.
  * We own filter, exclusion, and filter_expression.
  */
-int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
+int cmd_enable_event(struct ltt_session *session,
+		const struct lttng_domain *domain,
 		char *channel_name, struct lttng_event *event,
 		char *filter_expression,
 		struct lttng_filter_bytecode *filter,
@@ -2407,7 +2414,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
  * reserved names.
  */
 static int cmd_enable_event_internal(struct ltt_session *session,
-		struct lttng_domain *domain,
+		const struct lttng_domain *domain,
 		char *channel_name, struct lttng_event *event,
 		char *filter_expression,
 		struct lttng_filter_bytecode *filter,
@@ -2429,7 +2436,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 +2616,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,13 +2693,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;
 			}
 		}
 
@@ -2701,6 +2709,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;
 			}
 		}
 
@@ -3706,7 +3715,7 @@ error:
  * Return LTTNG_OK on success or else a LTTNG_ERR code.
  */
 int cmd_snapshot_add_output(struct ltt_session *session,
-		struct lttng_snapshot_output *output, uint32_t *id)
+		const struct lttng_snapshot_output *output, uint32_t *id)
 {
 	int ret;
 	struct snapshot_output *new_output;
@@ -3774,7 +3783,7 @@ error:
  * Return LTTNG_OK on success or else a LTTNG_ERR code.
  */
 int cmd_snapshot_del_output(struct ltt_session *session,
-		struct lttng_snapshot_output *output)
+		const struct lttng_snapshot_output *output)
 {
 	int ret;
 	struct snapshot_output *sout = NULL;
@@ -4602,7 +4611,7 @@ error:
  * Return LTTNG_OK on success or else a LTTNG_ERR code.
  */
 int cmd_snapshot_record(struct ltt_session *session,
-		struct lttng_snapshot_output *output, int wait)
+		const struct lttng_snapshot_output *output, int wait)
 {
 	enum lttng_error_code cmd_ret = LTTNG_OK;
 	int ret;
@@ -4989,6 +4998,9 @@ int cmd_rotate_get_info(struct ltt_session *session,
 			}
 			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 =
@@ -5007,9 +5019,9 @@ 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);
@@ -5020,6 +5032,7 @@ int cmd_rotate_get_info(struct ltt_session *session,
 				goto end;
 			}
 			break;
+		}
 		default:
 			abort();
 		}