X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=26e8d152c2d02c9558f200f78a8af3da2c614033;hb=20da94cc6302449fbbd5328dba6ec892da91b796;hp=69dfda6a3bf384813cc62189c2299348e12929b5;hpb=f1613f52941de629d913f7945cac7447d164728a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 69dfda6a3..26e8d152c 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -17,6 +17,7 @@
 
 #define _GNU_SOURCE
 #include <assert.h>
+#include <string.h>
 #include <inttypes.h>
 #include <urcu/list.h>
 #include <urcu/uatomic.h>
@@ -305,6 +306,9 @@ static int list_lttng_ust_global_events(char *channel_name,
 		if (uevent->filter) {
 			tmp[i].filter = 1;
 		}
+		if (uevent->exclusion) {
+			tmp[i].exclusion = 1;
+		}
 		i++;
 	}
 
@@ -455,6 +459,7 @@ static int add_uri_to_consumer(struct consumer_output *consumer,
 			 * URI was the same in the consumer so we do not append the subdir
 			 * again so to not duplicate output dir.
 			 */
+			ret = LTTNG_OK;
 			goto error;
 		}
 
@@ -899,11 +904,21 @@ int cmd_enable_channel(struct ltt_session *session,
 	int ret;
 	struct ltt_ust_session *usess = session->ust_session;
 	struct lttng_ht *chan_ht;
+	size_t len;
 
 	assert(session);
 	assert(attr);
 	assert(domain);
 
+	len = strnlen(attr->name, sizeof(attr->name));
+
+	/* Validate channel name */
+	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);
 
 	rcu_read_lock();
@@ -912,7 +927,7 @@ int cmd_enable_channel(struct ltt_session *session,
 	 * Don't try to enable a channel if the session has been started at
 	 * some point in time before. The tracer does not allow it.
 	 */
-	if (session->started) {
+	if (session->has_been_started) {
 		ret = LTTNG_ERR_TRACE_ALREADY_STARTED;
 		goto error;
 	}
@@ -927,6 +942,16 @@ int cmd_enable_channel(struct ltt_session *session,
 		attr->attr.switch_timer_interval = 0;
 	}
 
+	/*
+	 * The ringbuffer (both in user space and kernel) behave badly in overwrite
+	 * mode and with less than 2 subbuf so block it right away and send back an
+	 * invalid attribute error.
+	 */
+	if (attr->attr.overwrite && attr->attr.num_subbuf < 2) {
+		ret = LTTNG_ERR_INVALID;
+		goto error;
+	}
+
 	switch (domain->type) {
 	case LTTNG_DOMAIN_KERNEL:
 	{
@@ -935,15 +960,6 @@ int cmd_enable_channel(struct ltt_session *session,
 		kchan = trace_kernel_get_channel_by_name(attr->name,
 				session->kernel_session);
 		if (kchan == NULL) {
-			/*
-			 * Don't try to create a channel if the session
-			 * has been started at some point in time
-			 * before. The tracer does not allow it.
-			 */
-			if (session->started) {
-				ret = LTTNG_ERR_TRACE_ALREADY_STARTED;
-				goto error;
-			}
 			ret = channel_kernel_create(session->kernel_session, attr, wpipe);
 			if (attr->name[0] != '\0') {
 				session->kernel_session->has_non_default_channel = 1;
@@ -967,15 +983,6 @@ int cmd_enable_channel(struct ltt_session *session,
 
 		uchan = trace_ust_find_channel_by_name(chan_ht, attr->name);
 		if (uchan == NULL) {
-			/*
-			 * Don't try to create a channel if the session
-			 * has been started at some point in time
-			 * before. The tracer does not allow it.
-			 */
-			if (session->started) {
-				ret = LTTNG_ERR_TRACE_ALREADY_STARTED;
-				goto error;
-			}
 			ret = channel_ust_create(usess, attr, domain->buf_type);
 			if (attr->name[0] != '\0') {
 				usess->has_non_default_channel = 1;
@@ -992,6 +999,7 @@ int cmd_enable_channel(struct ltt_session *session,
 
 error:
 	rcu_read_unlock();
+end:
 	return ret;
 }
 
@@ -1436,9 +1444,16 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		assert(usess);
 
 		/* Create the default JUL tracepoint. */
+		memset(&uevent, 0, sizeof(uevent));
 		uevent.type = LTTNG_EVENT_TRACEPOINT;
 		uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
-		strncpy(uevent.name, DEFAULT_JUL_EVENT_NAME, sizeof(uevent.name));
+		if (is_root) {
+			strncpy(uevent.name, DEFAULT_SYS_JUL_EVENT_NAME,
+					sizeof(uevent.name));
+		} else {
+			strncpy(uevent.name, DEFAULT_USER_JUL_EVENT_NAME,
+					sizeof(uevent.name));
+		}
 		uevent.name[sizeof(uevent.name) - 1] = '\0';
 
 		/*
@@ -1450,16 +1465,16 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		tmp_dom.type = LTTNG_DOMAIN_UST;
 
 		ret = cmd_enable_event(session, &tmp_dom, DEFAULT_JUL_CHANNEL_NAME,
-				&uevent, NULL, NULL, wpipe);
+				&uevent, filter, NULL, wpipe);
 		if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
 			goto error;
 		}
 
 		/* The wild card * means that everything should be enabled. */
 		if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
-			ret = event_jul_enable_all(usess);
+			ret = event_jul_enable_all(usess, event, filter);
 		} else {
-			ret = event_jul_enable(usess, event);
+			ret = event_jul_enable(usess, event, filter);
 		}
 		if (ret != LTTNG_OK) {
 			goto error;
@@ -1641,7 +1656,7 @@ int cmd_enable_event_all(struct ltt_session *session,
 	}
 	case LTTNG_DOMAIN_JUL:
 	{
-		struct lttng_event uevent;
+		struct lttng_event uevent, event;
 		struct lttng_domain tmp_dom;
 		struct ltt_ust_session *usess = session->ust_session;
 
@@ -1650,7 +1665,13 @@ int cmd_enable_event_all(struct ltt_session *session,
 		/* Create the default JUL tracepoint. */
 		uevent.type = LTTNG_EVENT_TRACEPOINT;
 		uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
-		strncpy(uevent.name, DEFAULT_JUL_EVENT_NAME, sizeof(uevent.name));
+		if (is_root) {
+			strncpy(uevent.name, DEFAULT_SYS_JUL_EVENT_NAME,
+					sizeof(uevent.name));
+		} else {
+			strncpy(uevent.name, DEFAULT_USER_JUL_EVENT_NAME,
+					sizeof(uevent.name));
+		}
 		uevent.name[sizeof(uevent.name) - 1] = '\0';
 
 		/*
@@ -1667,7 +1688,12 @@ int cmd_enable_event_all(struct ltt_session *session,
 			goto error;
 		}
 
-		ret = event_jul_enable_all(usess);
+		event.loglevel = LTTNG_LOGLEVEL_JUL_ALL;
+		event.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
+		strncpy(event.name, "*", sizeof(event.name));
+		event.name[sizeof(event.name) - 1] = '\0';
+
+		ret = event_jul_enable_all(usess, &event, filter);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -1770,6 +1796,7 @@ error:
 int cmd_start_trace(struct ltt_session *session)
 {
 	int ret;
+	unsigned long nb_chan = 0;
 	struct ltt_kernel_session *ksession;
 	struct ltt_ust_session *usess;
 
@@ -1779,13 +1806,28 @@ int cmd_start_trace(struct ltt_session *session)
 	ksession = session->kernel_session;
 	usess = session->ust_session;
 
-	if (session->enabled) {
-		/* Already started. */
+	/* Is the session already started? */
+	if (session->active) {
 		ret = LTTNG_ERR_TRACE_ALREADY_STARTED;
 		goto error;
 	}
 
-	session->enabled = 1;
+	/*
+	 * Starting a session without channel is useless since after that it's not
+	 * possible to enable channel thus inform the client.
+	 */
+	if (usess && usess->domain_global.channels) {
+		rcu_read_lock();
+		nb_chan += lttng_ht_get_count(usess->domain_global.channels);
+		rcu_read_unlock();
+	}
+	if (ksession) {
+		nb_chan += ksession->channel_count;
+	}
+	if (!nb_chan) {
+		ret = LTTNG_ERR_NO_CHANNEL;
+		goto error;
+	}
 
 	/* Kernel tracing */
 	if (ksession != NULL) {
@@ -1806,7 +1848,9 @@ int cmd_start_trace(struct ltt_session *session)
 		}
 	}
 
-	session->started = 1;
+	/* Flag this after a successful start. */
+	session->has_been_started = 1;
+	session->active = 1;
 
 	ret = LTTNG_OK;
 
@@ -1830,13 +1874,12 @@ int cmd_stop_trace(struct ltt_session *session)
 	ksession = session->kernel_session;
 	usess = session->ust_session;
 
-	if (!session->enabled) {
+	/* Session is not active. Skip everythong and inform the client. */
+	if (!session->active) {
 		ret = LTTNG_ERR_TRACE_ALREADY_STOPPED;
 		goto error;
 	}
 
-	session->enabled = 0;
-
 	/* Kernel tracer */
 	if (ksession && ksession->started) {
 		DBG("Stop kernel tracing");
@@ -1878,6 +1921,8 @@ int cmd_stop_trace(struct ltt_session *session)
 		}
 	}
 
+	/* Flag inactive after a successful stop. */
+	session->active = 0;
 	ret = LTTNG_OK;
 
 error:
@@ -1899,8 +1944,8 @@ int cmd_set_consumer_uri(int domain, struct ltt_session *session,
 	assert(uris);
 	assert(nb_uri > 0);
 
-	/* Can't enable consumer after session started. */
-	if (session->enabled) {
+	/* Can't set consumer URI if the session is active. */
+	if (session->active) {
 		ret = LTTNG_ERR_TRACE_ALREADY_STARTED;
 		goto error;
 	}
@@ -1940,6 +1985,17 @@ int cmd_set_consumer_uri(int domain, struct ltt_session *session,
 		}
 	}
 
+	/*
+	 * Make sure to set the session in output mode after we set URI since a
+	 * session can be created without URL (thus flagged in no output mode).
+	 */
+	session->output_traces = 1;
+	if (ksess) {
+		ksess->output_traces = 1;
+	} else if (usess) {
+		usess->output_traces = 1;
+	}
+
 	/* All good! */
 	ret = LTTNG_OK;
 
@@ -2144,7 +2200,14 @@ int cmd_calibrate(int domain, struct lttng_calibrate *calibrate)
 	{
 		struct lttng_kernel_calibrate kcalibrate;
 
-		kcalibrate.type = calibrate->type;
+		switch (calibrate->type) {
+		case LTTNG_CALIBRATE_FUNCTION:
+		default:
+			/* Default and only possible calibrate option. */
+			kcalibrate.type = LTTNG_KERNEL_CALIBRATE_KRETPROBE;
+			break;
+		}
+
 		ret = kernel_calibrate(kernel_tracer_fd, &kcalibrate);
 		if (ret < 0) {
 			ret = LTTNG_ERR_KERN_ENABLE_FAIL;
@@ -2156,7 +2219,14 @@ int cmd_calibrate(int domain, struct lttng_calibrate *calibrate)
 	{
 		struct lttng_ust_calibrate ucalibrate;
 
-		ucalibrate.type = calibrate->type;
+		switch (calibrate->type) {
+		case LTTNG_CALIBRATE_FUNCTION:
+		default:
+			/* Default and only possible calibrate option. */
+			ucalibrate.type = LTTNG_UST_CALIBRATE_TRACEPOINT;
+			break;
+		}
+
 		ret = ust_app_calibrate_glb(&ucalibrate);
 		if (ret < 0) {
 			ret = LTTNG_ERR_UST_CALIBRATE_FAIL;
@@ -2328,16 +2398,18 @@ ssize_t cmd_list_channels(int domain, struct ltt_session *session,
 		break;
 	case LTTNG_DOMAIN_UST:
 		if (session->ust_session != NULL) {
+			rcu_read_lock();
 			nb_chan = lttng_ht_get_count(
-					session->ust_session->domain_global.channels);
+				session->ust_session->domain_global.channels);
+			rcu_read_unlock();
 		}
 		DBG3("Number of UST global channels %zd", nb_chan);
-		if (nb_chan <= 0) {
+		if (nb_chan < 0) {
 			ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+			goto error;
 		}
 		break;
 	default:
-		*channels = NULL;
 		ret = LTTNG_ERR_UND;
 		goto error;
 	}
@@ -2350,10 +2422,6 @@ ssize_t cmd_list_channels(int domain, struct ltt_session *session,
 		}
 
 		list_lttng_channels(domain, session, *channels);
-	} else {
-		*channels = NULL;
-		/* Ret value was set in the domain switch case */
-		goto error;
 	}
 
 	return nb_chan;
@@ -2453,8 +2521,9 @@ void cmd_list_lttng_sessions(struct lttng_session *sessions, uid_t uid,
 
 		strncpy(sessions[i].name, session->name, NAME_MAX);
 		sessions[i].name[NAME_MAX - 1] = '\0';
-		sessions[i].enabled = session->enabled;
+		sessions[i].enabled = session->active;
 		sessions[i].snapshot_mode = session->snapshot_mode;
+		sessions[i].live_timer_interval = session->live_timer;
 		i++;
 	}
 }
@@ -2472,9 +2541,24 @@ int cmd_data_pending(struct ltt_session *session)
 	assert(session);
 
 	/* Session MUST be stopped to ask for data availability. */
-	if (session->enabled) {
+	if (session->active) {
 		ret = LTTNG_ERR_SESSION_STARTED;
 		goto error;
+	} else {
+		/*
+		 * If stopped, just make sure we've started before else the above call
+		 * will always send that there is data pending.
+		 *
+		 * The consumer assumes that when the data pending command is received,
+		 * the trace has been started before or else no output data is written
+		 * by the streams which is a condition for data pending. So, this is
+		 * *VERY* important that we don't ask the consumer before a start
+		 * trace.
+		 */
+		if (!session->has_been_started) {
+			ret = 0;
+			goto error;
+		}
 	}
 
 	if (ksess && ksess->consumer) {
@@ -2623,7 +2707,7 @@ ssize_t cmd_snapshot_list_outputs(struct ltt_session *session,
 		struct lttng_snapshot_output **outputs)
 {
 	int ret, idx = 0;
-	struct lttng_snapshot_output *list;
+	struct lttng_snapshot_output *list = NULL;
 	struct lttng_ht_iter iter;
 	struct snapshot_output *output;
 
@@ -2637,7 +2721,7 @@ ssize_t cmd_snapshot_list_outputs(struct ltt_session *session,
 	 * set in no output mode.
 	 */
 	if (session->output_traces) {
-		ret = LTTNG_ERR_EPERM;
+		ret = -LTTNG_ERR_EPERM;
 		goto error;
 	}
 
@@ -2648,11 +2732,12 @@ ssize_t cmd_snapshot_list_outputs(struct ltt_session *session,
 
 	list = zmalloc(session->snapshot.nb_output * sizeof(*list));
 	if (!list) {
-		ret = LTTNG_ERR_NOMEM;
+		ret = -LTTNG_ERR_NOMEM;
 		goto error;
 	}
 
 	/* Copy list from session to the new list object. */
+	rcu_read_lock();
 	cds_lfht_for_each_entry(session->snapshot.output_ht->ht, &iter.iter,
 			output, node.node) {
 		assert(output->consumer);
@@ -2667,28 +2752,28 @@ ssize_t cmd_snapshot_list_outputs(struct ltt_session *session,
 			ret = uri_to_str_url(&output->consumer->dst.net.control,
 					list[idx].ctrl_url, sizeof(list[idx].ctrl_url));
 			if (ret < 0) {
-				ret = LTTNG_ERR_NOMEM;
-				goto free_error;
+				ret = -LTTNG_ERR_NOMEM;
+				goto error;
 			}
 
 			/* Data URI. */
 			ret = uri_to_str_url(&output->consumer->dst.net.data,
 					list[idx].data_url, sizeof(list[idx].data_url));
 			if (ret < 0) {
-				ret = LTTNG_ERR_NOMEM;
-				goto free_error;
+				ret = -LTTNG_ERR_NOMEM;
+				goto error;
 			}
 		}
 		idx++;
 	}
 
 	*outputs = list;
-	return session->snapshot.nb_output;
-
-free_error:
-	free(list);
+	list = NULL;
+	ret = session->snapshot.nb_output;
 error:
-	return -ret;
+	free(list);
+	rcu_read_unlock();
+	return ret;
 }
 
 /*
@@ -2781,11 +2866,13 @@ static int record_kernel_snapshot(struct ltt_kernel_session *ksess,
 	}
 
 	ret = LTTNG_OK;
+	goto end;
 
 error_snapshot:
 	/* Clean up copied sockets so this output can use some other later on. */
 	consumer_destroy_output_sockets(output->consumer);
 error:
+end:
 	return ret;
 }
 
@@ -2829,12 +2916,17 @@ static int record_ust_snapshot(struct ltt_ust_session *usess,
 
 	ret = ust_app_snapshot_record(usess, output, wait, nb_streams);
 	if (ret < 0) {
-		if (ret == -EINVAL) {
+		switch (-ret) {
+		case EINVAL:
 			ret = LTTNG_ERR_INVALID;
-			goto error_snapshot;
+			break;
+		case ENODATA:
+			ret = LTTNG_ERR_SNAPSHOT_NODATA;
+			break;
+		default:
+			ret = LTTNG_ERR_SNAPSHOT_FAIL;
+			break;
 		}
-
-		ret = LTTNG_ERR_SNAPSHOT_FAIL;
 		goto error_snapshot;
 	}
 
@@ -2900,7 +2992,7 @@ int cmd_snapshot_record(struct ltt_session *session,
 	}
 
 	/* The session needs to be started at least once. */
-	if (!session->started) {
+	if (!session->has_been_started) {
 		ret = LTTNG_ERR_START_SESSION_ONCE;
 		goto error;
 	}