X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=ff418e17ee0df63f8a82518db844d500fd879bcb;hp=1d4f9264eb0a57e4aedfa595767b1478b9402a4f;hb=e5f5db7fe1ce6cf8e0ac6b2be2b4c85c2ba68375;hpb=806e2684ce24d3772af37ee46c5f0500c7a0723f

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 1d4f9264e..ff418e17e 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -101,11 +101,22 @@ static int build_network_session_path(char *dst, size_t size,
 		goto error;
 	}
 
+	/*
+	 * Do we have a UST url set. If yes, this means we have both kernel and UST
+	 * to print.
+	 */
 	if (strlen(tmp_uurl) > 0) {
 		ret = snprintf(dst, size, "[K]: %s [data: %d] -- [U]: %s [data: %d]",
 				tmp_urls, kdata_port, tmp_uurl, udata_port);
 	} else {
-		ret = snprintf(dst, size, "%s [data: %d]", tmp_urls, kdata_port);
+		int dport;
+		if (kuri) {
+			dport = kdata_port;
+		} else {
+			/* No kernel URI, use the UST port. */
+			dport = udata_port;
+		}
+		ret = snprintf(dst, size, "%s [data: %d]", tmp_urls, dport);
 	}
 
 error:
@@ -429,7 +440,7 @@ static int init_kernel_tracing(struct ltt_kernel_session *session)
 			assert(socket->fd >= 0);
 
 			pthread_mutex_lock(socket->lock);
-			ret = kernel_consumer_send_session(socket->fd, session);
+			ret = kernel_consumer_send_session(socket, session);
 			pthread_mutex_unlock(socket->lock);
 			if (ret < 0) {
 				ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
@@ -517,7 +528,7 @@ error:
  */
 static int send_consumer_relayd_socket(int domain, struct ltt_session *session,
 		struct lttng_uri *relayd_uri, struct consumer_output *consumer,
-		int consumer_fd)
+		struct consumer_socket *consumer_sock)
 {
 	int ret;
 	struct lttcomm_sock *sock = NULL;
@@ -546,8 +557,8 @@ static int send_consumer_relayd_socket(int domain, struct ltt_session *session,
 	}
 
 	/* Send relayd socket to consumer. */
-	ret = consumer_send_relayd_socket(consumer_fd, sock,
-			consumer, relayd_uri->stype);
+	ret = consumer_send_relayd_socket(consumer_sock, sock,
+			consumer, relayd_uri->stype, session->id);
 	if (ret < 0) {
 		ret = LTTNG_ERR_ENABLE_CONSUMER_FAIL;
 		goto close_sock;
@@ -582,9 +593,10 @@ close_sock:
  * session.
  */
 static int send_consumer_relayd_sockets(int domain,
-		struct ltt_session *session, struct consumer_output *consumer, int fd)
+		struct ltt_session *session, struct consumer_output *consumer,
+		struct consumer_socket *sock)
 {
-	int ret;
+	int ret = LTTNG_OK;
 
 	assert(session);
 	assert(consumer);
@@ -592,7 +604,7 @@ static int send_consumer_relayd_sockets(int domain,
 	/* Sending control relayd socket. */
 	if (!consumer->dst.net.control_sock_sent) {
 		ret = send_consumer_relayd_socket(domain, session,
-				&consumer->dst.net.control, consumer, fd);
+				&consumer->dst.net.control, consumer, sock);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -601,7 +613,7 @@ static int send_consumer_relayd_sockets(int domain,
 	/* Sending data relayd socket. */
 	if (!consumer->dst.net.data_sock_sent) {
 		ret = send_consumer_relayd_socket(domain, session,
-				&consumer->dst.net.data, consumer, fd);
+				&consumer->dst.net.data, consumer, sock);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -640,8 +652,8 @@ static int setup_relayd(struct ltt_session *session)
 			assert(socket->fd >= 0);
 
 			pthread_mutex_lock(socket->lock);
-			send_consumer_relayd_sockets(LTTNG_DOMAIN_UST, session,
-					usess->consumer, socket->fd);
+			ret = send_consumer_relayd_sockets(LTTNG_DOMAIN_UST, session,
+					usess->consumer, socket);
 			pthread_mutex_unlock(socket->lock);
 			if (ret != LTTNG_OK) {
 				goto error;
@@ -657,8 +669,8 @@ static int setup_relayd(struct ltt_session *session)
 			assert(socket->fd >= 0);
 
 			pthread_mutex_lock(socket->lock);
-			send_consumer_relayd_sockets(LTTNG_DOMAIN_KERNEL, session,
-					ksess->consumer, socket->fd);
+			ret = send_consumer_relayd_sockets(LTTNG_DOMAIN_KERNEL, session,
+					ksess->consumer, socket);
 			pthread_mutex_unlock(socket->lock);
 			if (ret != LTTNG_OK) {
 				goto error;
@@ -670,6 +682,71 @@ error:
 	return ret;
 }
 
+/*
+ * Start a kernel session by opening all necessary streams.
+ */
+static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe)
+{
+	int ret;
+	struct ltt_kernel_channel *kchan;
+
+	/* Open kernel metadata */
+	if (ksess->metadata == NULL) {
+		ret = kernel_open_metadata(ksess);
+		if (ret < 0) {
+			ret = LTTNG_ERR_KERN_META_FAIL;
+			goto error;
+		}
+	}
+
+	/* Open kernel metadata stream */
+	if (ksess->metadata_stream_fd < 0) {
+		ret = kernel_open_metadata_stream(ksess);
+		if (ret < 0) {
+			ERR("Kernel create metadata stream failed");
+			ret = LTTNG_ERR_KERN_STREAM_FAIL;
+			goto error;
+		}
+	}
+
+	/* For each channel */
+	cds_list_for_each_entry(kchan, &ksess->channel_list.head, list) {
+		if (kchan->stream_count == 0) {
+			ret = kernel_open_channel_stream(kchan);
+			if (ret < 0) {
+				ret = LTTNG_ERR_KERN_STREAM_FAIL;
+				goto error;
+			}
+			/* Update the stream global counter */
+			ksess->stream_count_global += ret;
+		}
+	}
+
+	/* Setup kernel consumer socket and send fds to it */
+	ret = init_kernel_tracing(ksess);
+	if (ret < 0) {
+		ret = LTTNG_ERR_KERN_START_FAIL;
+		goto error;
+	}
+
+	/* This start the kernel tracing */
+	ret = kernel_start_session(ksess);
+	if (ret < 0) {
+		ret = LTTNG_ERR_KERN_START_FAIL;
+		goto error;
+	}
+
+	/* Quiescent wait after starting trace */
+	kernel_wait_quiescent(kernel_tracer_fd);
+
+	ksess->started = 1;
+
+	ret = LTTNG_OK;
+
+error:
+	return ret;
+}
+
 /*
  * Command LTTNG_DISABLE_CHANNEL processed by the client thread.
  */
@@ -750,9 +827,6 @@ int cmd_enable_channel(struct ltt_session *session,
 	{
 		struct ltt_kernel_channel *kchan;
 
-		/* Mandatory for a kernel channel. */
-		assert(wpipe > 0);
-
 		kchan = trace_kernel_get_channel_by_name(attr->name,
 				session->kernel_session);
 		if (kchan == NULL) {
@@ -766,6 +840,18 @@ int cmd_enable_channel(struct ltt_session *session,
 		}
 
 		kernel_wait_quiescent(kernel_tracer_fd);
+
+		/*
+		 * If the session was previously started, start as well this newly
+		 * created kernel session so the events/channels enabled *after* the
+		 * start actually work.
+		 */
+		if (session->started && !session->kernel_session->started) {
+			ret = start_kernel_session(session->kernel_session, wpipe);
+			if (ret != LTTNG_OK) {
+				goto error;
+			}
+		}
 		break;
 	}
 	case LTTNG_DOMAIN_UST:
@@ -780,6 +866,17 @@ int cmd_enable_channel(struct ltt_session *session,
 		} else {
 			ret = channel_ust_enable(usess, domain, uchan);
 		}
+
+		/* Start the UST session if the session was already started. */
+		if (session->started && !usess->start_trace) {
+			ret = ust_app_start_trace_all(usess);
+			if (ret < 0) {
+				ret = LTTNG_ERR_UST_START_FAIL;
+				goto error;
+			}
+			ret = LTTNG_OK;
+			usess->start_trace = 1;
+		}
 		break;
 	}
 #if 0
@@ -939,15 +1036,24 @@ error:
  * Command LTTNG_ADD_CONTEXT processed by the client thread.
  */
 int cmd_add_context(struct ltt_session *session, int domain,
-		char *channel_name, char *event_name, struct lttng_event_context *ctx)
+		char *channel_name, struct lttng_event_context *ctx, int kwpipe)
 {
 	int ret;
 
 	switch (domain) {
 	case LTTNG_DOMAIN_KERNEL:
+		assert(session->kernel_session);
+
+		if (session->kernel_session->channel_count == 0) {
+			/* Create default channel */
+			ret = channel_kernel_create(session->kernel_session, NULL, kwpipe);
+			if (ret != LTTNG_OK) {
+				goto error;
+			}
+		}
+
 		/* Add kernel context to kernel tracer */
-		ret = context_kernel_add(session->kernel_session, ctx,
-				event_name, channel_name);
+		ret = context_kernel_add(session->kernel_session, ctx, channel_name);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -955,49 +1061,28 @@ int cmd_add_context(struct ltt_session *session, int domain,
 	case LTTNG_DOMAIN_UST:
 	{
 		struct ltt_ust_session *usess = session->ust_session;
-
 		assert(usess);
 
-		ret = context_ust_add(usess, domain, ctx, event_name, channel_name);
-		if (ret != LTTNG_OK) {
-			goto error;
-		}
-		break;
-	}
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
-	default:
-		ret = LTTNG_ERR_UND;
-		goto error;
-	}
-
-	ret = LTTNG_OK;
-
-error:
-	return ret;
-}
-
-/*
- * Command LTTNG_SET_FILTER processed by the client thread.
- */
-int cmd_set_filter(struct ltt_session *session, int domain,
-		char *channel_name, char *event_name,
-		struct lttng_filter_bytecode *bytecode)
-{
-	int ret;
+		unsigned int chan_count =
+			lttng_ht_get_count(usess->domain_global.channels);
+		if (chan_count == 0) {
+			struct lttng_channel *attr;
+			/* Create default channel */
+			attr = channel_new_default_attr(domain);
+			if (attr == NULL) {
+				ret = LTTNG_ERR_FATAL;
+				goto error;
+			}
 
-	switch (domain) {
-	case LTTNG_DOMAIN_KERNEL:
-		ret = LTTNG_ERR_FATAL;
-		break;
-	case LTTNG_DOMAIN_UST:
-	{
-		struct ltt_ust_session *usess = session->ust_session;
+			ret = channel_ust_create(usess, domain, attr);
+			if (ret != LTTNG_OK) {
+				free(attr);
+				goto error;
+			}
+			free(attr);
+		}
 
-		ret = filter_ust_set(usess, domain, bytecode, event_name, channel_name);
+		ret = context_ust_add(usess, domain, ctx, channel_name);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -1017,17 +1102,16 @@ int cmd_set_filter(struct ltt_session *session, int domain,
 
 error:
 	return ret;
-
 }
 
-
 /*
  * Command LTTNG_ENABLE_EVENT processed by the client thread.
  */
 int cmd_enable_event(struct ltt_session *session, int domain,
-		char *channel_name, struct lttng_event *event, int wpipe)
+		char *channel_name, struct lttng_event *event,
+		struct lttng_filter_bytecode *filter, int wpipe)
 {
-	int ret;
+	int ret, channel_created = 0;
 	struct lttng_channel *attr;
 
 	assert(session);
@@ -1055,6 +1139,8 @@ int cmd_enable_event(struct ltt_session *session, int domain,
 				goto error;
 			}
 			free(attr);
+
+			channel_created = 1;
 		}
 
 		/* Get the newly created kernel channel pointer */
@@ -1069,6 +1155,10 @@ int cmd_enable_event(struct ltt_session *session, int domain,
 		ret = event_kernel_enable_tracepoint(session->kernel_session, kchan,
 				event);
 		if (ret != LTTNG_OK) {
+			if (channel_created) {
+				/* Let's not leak a useless channel. */
+				kernel_destroy_channel(kchan);
+			}
 			goto error;
 		}
 
@@ -1108,7 +1198,7 @@ int cmd_enable_event(struct ltt_session *session, int domain,
 		}
 
 		/* At this point, the session and channel exist on the tracer */
-		ret = event_ust_enable_tracepoint(usess, domain, uchan, event);
+		ret = event_ust_enable_tracepoint(usess, domain, uchan, event, filter);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -1134,7 +1224,8 @@ error:
  * Command LTTNG_ENABLE_ALL_EVENT processed by the client thread.
  */
 int cmd_enable_event_all(struct ltt_session *session, int domain,
-		char *channel_name, int event_type, int wpipe)
+		char *channel_name, int event_type,
+		struct lttng_filter_bytecode *filter, int wpipe)
 {
 	int ret;
 	struct lttng_channel *attr;
@@ -1198,6 +1289,10 @@ int cmd_enable_event_all(struct ltt_session *session, int domain,
 
 		/* Manage return value */
 		if (ret != LTTNG_OK) {
+			/*
+			 * On error, cmd_enable_channel call will take care of destroying
+			 * the created channel if it was needed.
+			 */
 			goto error;
 		}
 
@@ -1241,7 +1336,8 @@ int cmd_enable_event_all(struct ltt_session *session, int domain,
 		switch (event_type) {
 		case LTTNG_EVENT_ALL:
 		case LTTNG_EVENT_TRACEPOINT:
-			ret = event_ust_enable_all_tracepoints(usess, domain, uchan);
+			ret = event_ust_enable_all_tracepoints(usess, domain, uchan,
+					filter);
 			if (ret != LTTNG_OK) {
 				goto error;
 			}
@@ -1348,7 +1444,6 @@ int cmd_start_trace(struct ltt_session *session)
 	int ret;
 	struct ltt_kernel_session *ksession;
 	struct ltt_ust_session *usess;
-	struct ltt_kernel_channel *kchan;
 
 	assert(session);
 
@@ -1372,54 +1467,10 @@ int cmd_start_trace(struct ltt_session *session)
 
 	/* Kernel tracing */
 	if (ksession != NULL) {
-		/* Open kernel metadata */
-		if (ksession->metadata == NULL) {
-			ret = kernel_open_metadata(ksession);
-			if (ret < 0) {
-				ret = LTTNG_ERR_KERN_META_FAIL;
-				goto error;
-			}
-		}
-
-		/* Open kernel metadata stream */
-		if (ksession->metadata_stream_fd < 0) {
-			ret = kernel_open_metadata_stream(ksession);
-			if (ret < 0) {
-				ERR("Kernel create metadata stream failed");
-				ret = LTTNG_ERR_KERN_STREAM_FAIL;
-				goto error;
-			}
-		}
-
-		/* For each channel */
-		cds_list_for_each_entry(kchan, &ksession->channel_list.head, list) {
-			if (kchan->stream_count == 0) {
-				ret = kernel_open_channel_stream(kchan);
-				if (ret < 0) {
-					ret = LTTNG_ERR_KERN_STREAM_FAIL;
-					goto error;
-				}
-				/* Update the stream global counter */
-				ksession->stream_count_global += ret;
-			}
-		}
-
-		/* Setup kernel consumer socket and send fds to it */
-		ret = init_kernel_tracing(ksession);
-		if (ret < 0) {
-			ret = LTTNG_ERR_KERN_START_FAIL;
-			goto error;
-		}
-
-		/* This start the kernel tracing */
-		ret = kernel_start_session(ksession);
-		if (ret < 0) {
-			ret = LTTNG_ERR_KERN_START_FAIL;
+		ret = start_kernel_session(ksession, kernel_tracer_fd);
+		if (ret != LTTNG_OK) {
 			goto error;
 		}
-
-		/* Quiescent wait after starting trace */
-		kernel_wait_quiescent(kernel_tracer_fd);
 	}
 
 	/* Flag session that trace should start automatically */
@@ -1433,6 +1484,8 @@ int cmd_start_trace(struct ltt_session *session)
 		}
 	}
 
+	session->started = 1;
+
 	ret = LTTNG_OK;
 
 error:
@@ -1489,6 +1542,8 @@ int cmd_stop_trace(struct ltt_session *session)
 		}
 
 		kernel_wait_quiescent(kernel_tracer_fd);
+
+		ksession->started = 0;
 	}
 
 	if (usess) {
@@ -1501,6 +1556,8 @@ int cmd_stop_trace(struct ltt_session *session)
 		}
 	}
 
+	session->started = 0;
+
 	ret = LTTNG_OK;
 
 error:
@@ -1528,11 +1585,6 @@ int cmd_set_consumer_uri(int domain, struct ltt_session *session,
 		goto error;
 	}
 
-	if (!session->start_consumer) {
-		ret = LTTNG_ERR_NO_CONSUMER;
-		goto error;
-	}
-
 	/*
 	 * This case switch makes sure the domain session has a temporary consumer
 	 * so the URL can be set.
@@ -1616,7 +1668,7 @@ int cmd_set_consumer_uri(int domain, struct ltt_session *session,
 
 			pthread_mutex_lock(socket->lock);
 			ret = send_consumer_relayd_socket(domain, session, &uris[i],
-					consumer, socket->fd);
+					consumer, socket);
 			pthread_mutex_unlock(socket->lock);
 			if (ret != LTTNG_OK) {
 				rcu_read_unlock();
@@ -1839,8 +1891,11 @@ int cmd_register_consumer(struct ltt_session *session, int domain,
 
 		socket = consumer_allocate_socket(sock);
 		if (socket == NULL) {
+			ret = close(sock);
+			if (ret < 0) {
+				PERROR("close register consumer");
+			}
 			ret = LTTNG_ERR_FATAL;
-			close(sock);
 			goto error;
 		}
 
@@ -2142,11 +2197,6 @@ int cmd_enable_consumer(int domain, struct ltt_session *session)
 		goto error;
 	}
 
-	if (!session->start_consumer) {
-		ret = LTTNG_ERR_NO_CONSUMER;
-		goto error;
-	}
-
 	switch (domain) {
 	case 0:
 		assert(session->consumer);
@@ -2213,11 +2263,6 @@ int cmd_enable_consumer(int domain, struct ltt_session *session)
 			break;
 		}
 
-		/* Append default kernel trace dir to subdir */
-		strncat(ksess->consumer->subdir, DEFAULT_KERNEL_TRACE_DIR,
-				sizeof(ksess->consumer->subdir) -
-				strlen(ksess->consumer->subdir) - 1);
-
 		/*
 		 * @session-lock
 		 * This is race free for now since the session lock is acquired before
@@ -2226,6 +2271,7 @@ int cmd_enable_consumer(int domain, struct ltt_session *session)
 		 * is valid.
 		 */
 		rcu_read_lock();
+		/* Destroy current consumer. We are about to replace it */
 		consumer_destroy_output(ksess->consumer);
 		rcu_read_unlock();
 		ksess->consumer = consumer;
@@ -2299,11 +2345,6 @@ int cmd_enable_consumer(int domain, struct ltt_session *session)
 			break;
 		}
 
-		/* Append default kernel trace dir to subdir */
-		strncat(usess->consumer->subdir, DEFAULT_UST_TRACE_DIR,
-				sizeof(usess->consumer->subdir) -
-				strlen(usess->consumer->subdir) - 1);
-
 		/*
 		 * @session-lock
 		 * This is race free for now since the session lock is acquired before
@@ -2312,6 +2353,7 @@ int cmd_enable_consumer(int domain, struct ltt_session *session)
 		 * is valid.
 		 */
 		rcu_read_lock();
+		/* Destroy current consumer. We are about to replace it */
 		consumer_destroy_output(usess->consumer);
 		rcu_read_unlock();
 		usess->consumer = consumer;
@@ -2320,6 +2362,8 @@ int cmd_enable_consumer(int domain, struct ltt_session *session)
 		break;
 	}
 
+	session->start_consumer = 1;
+
 	/* Enable it */
 	if (consumer) {
 		consumer->enabled = 1;
@@ -2335,10 +2379,10 @@ error:
 }
 
 /*
- * Command LTTNG_DATA_AVAILABLE returning 0 if the data is NOT ready to be read
- * or else 1 if the data is available for trace analysis.
+ * Command LTTNG_DATA_PENDING returning 0 if the data is NOT pending meaning
+ * ready for trace analysis (or anykind of reader) or else 1 for pending data.
  */
-int cmd_data_available(struct ltt_session *session)
+int cmd_data_pending(struct ltt_session *session)
 {
 	int ret;
 	struct ltt_kernel_session *ksess = session->kernel_session;
@@ -2353,23 +2397,23 @@ int cmd_data_available(struct ltt_session *session)
 	}
 
 	if (ksess && ksess->consumer) {
-		ret = consumer_is_data_available(ksess->id, ksess->consumer);
-		if (ret == 0) {
+		ret = consumer_is_data_pending(ksess->id, ksess->consumer);
+		if (ret == 1) {
 			/* Data is still being extracted for the kernel. */
 			goto error;
 		}
 	}
 
 	if (usess && usess->consumer) {
-		ret = consumer_is_data_available(usess->id, usess->consumer);
-		if (ret == 0) {
+		ret = consumer_is_data_pending(usess->id, usess->consumer);
+		if (ret == 1) {
 			/* Data is still being extracted for the kernel. */
 			goto error;
 		}
 	}
 
 	/* Data is ready to be read by a viewer */
-	ret = 1;
+	ret = 0;
 
 error:
 	return ret;