X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=696e650debb70e6c0f9724b506a1b1413f0bd3a7;hp=98e090539af0ecf7755abc2dfe1332b2f116f3fa;hb=6bad3253d952934f18be50e032b3d495e7a54613;hpb=fa64dfb477cac50bb0b8a02fcf6b5a16a426d43b

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 98e090539..696e650de 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <inttypes.h>
 #include <urcu/list.h>
@@ -219,7 +220,9 @@ static int list_lttng_agent_events(struct agent *agt,
 
 	DBG3("Listing agent events");
 
+	rcu_read_lock();
 	nb_event = lttng_ht_get_count(agt->events);
+	rcu_read_unlock();
 	if (nb_event == 0) {
 		ret = nb_event;
 		goto error;
@@ -1039,7 +1042,8 @@ int cmd_disable_event(struct ltt_session *session, int domain,
 
 	event_name = event->name;
 
-	if (event->loglevel_type || event->loglevel || event->enabled
+	/* Error out on unhandled search criteria */
+	if (event->loglevel_type || event->loglevel != -1 || event->enabled
 			|| event->pid || event->filter || event->exclusion) {
 		return LTTNG_ERR_UNK;
 	}
@@ -1385,6 +1389,7 @@ end:
 
 /*
  * 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,
 		char *channel_name, struct lttng_event *event,
@@ -1536,6 +1541,10 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		/* At this point, the session and channel exist on the tracer */
 		ret = event_ust_enable_tracepoint(usess, uchan, event,
 				filter_expression, filter, exclusion);
+		/* We have passed ownership */
+		filter_expression = NULL;
+		filter = NULL;
+		exclusion = NULL;
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -1598,8 +1607,30 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 			assert(0);
 		}
 
-		ret = cmd_enable_event(session, &tmp_dom, (char *) default_chan_name,
-			&uevent, filter_expression, filter, NULL, wpipe);
+		{
+			struct lttng_filter_bytecode *filter_copy = NULL;
+
+			if (filter) {
+				filter_copy = zmalloc(
+					sizeof(struct lttng_filter_bytecode)
+					+ filter->len);
+				if (!filter_copy) {
+					goto error;
+				}
+
+				memcpy(filter_copy, filter,
+					sizeof(struct lttng_filter_bytecode)
+					+ filter->len);
+			}
+
+			ret = cmd_enable_event(session, &tmp_dom,
+					(char *) default_chan_name,
+					&uevent, filter_expression, filter_copy,
+					NULL, wpipe);
+			/* We have passed ownership */
+			filter_expression = NULL;
+		}
+
 		if (ret != LTTNG_OK && ret != LTTNG_ERR_UST_EVENT_ENABLED) {
 			goto error;
 		}
@@ -1607,8 +1638,10 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 		/* The wild card * means that everything should be enabled. */
 		if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
 			ret = event_agent_enable_all(usess, agt, event, filter);
+			filter = NULL;
 		} else {
 			ret = event_agent_enable(usess, agt, event, filter);
+			filter = NULL;
 		}
 		if (ret != LTTNG_OK) {
 			goto error;
@@ -1629,6 +1662,9 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 	ret = LTTNG_OK;
 
 error:
+	free(filter_expression);
+	free(filter);
+	free(exclusion);
 	rcu_read_unlock();
 	return ret;
 }
@@ -1848,7 +1884,9 @@ int cmd_start_trace(struct ltt_session *session)
 	 * 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;
@@ -2380,12 +2418,14 @@ ssize_t cmd_list_domains(struct ltt_session *session,
 		DBG3("Listing domains found UST global domain");
 		nb_dom++;
 
+		rcu_read_lock();
 		cds_lfht_for_each_entry(session->ust_session->agents->ht, &iter.iter,
 				agt, node.node) {
 			if (agt->being_used) {
 				nb_dom++;
 			}
 		}
+		rcu_read_unlock();
 	}
 
 	if (!nb_dom) {
@@ -2408,6 +2448,7 @@ ssize_t cmd_list_domains(struct ltt_session *session,
 		(*domains)[index].buf_type = session->ust_session->buffer_type;
 		index++;
 
+		rcu_read_lock();
 		cds_lfht_for_each_entry(session->ust_session->agents->ht, &iter.iter,
 				agt, node.node) {
 			if (agt->being_used) {
@@ -2416,6 +2457,7 @@ ssize_t cmd_list_domains(struct ltt_session *session,
 				index++;
 			}
 		}
+		rcu_read_unlock();
 	}
 end:
 	return nb_dom;
@@ -2447,16 +2489,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;
 	}
@@ -2469,10 +2513,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;
@@ -2513,10 +2553,12 @@ ssize_t cmd_list_events(int domain, struct ltt_session *session,
 			struct lttng_ht_iter iter;
 			struct agent *agt;
 
+			rcu_read_lock();
 			cds_lfht_for_each_entry(session->ust_session->agents->ht,
 					&iter.iter, agt, node.node) {
 				nb_event = list_lttng_agent_events(agt, events);
 			}
+			rcu_read_unlock();
 		}
 		break;
 	default:
@@ -2765,7 +2807,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;
 
@@ -2779,7 +2821,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;
 	}
 
@@ -2790,11 +2832,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);
@@ -2809,28 +2852,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;
 }
 
 /*
@@ -3023,12 +3066,14 @@ static uint64_t get_session_max_subbuf_size(struct ltt_session *session)
 		struct ltt_ust_channel *uchan;
 		struct ltt_ust_session *usess = session->ust_session;
 
+		rcu_read_lock();
 		cds_lfht_for_each_entry(usess->domain_global.channels->ht, &iter.iter,
 				uchan, node.node) {
 			if (uchan->attr.subbuf_size > max_size) {
 				max_size = uchan->attr.subbuf_size;
 			}
 		}
+		rcu_read_unlock();
 	}
 
 	return max_size;