X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=12bdf17cd9e63f3e4e8c19703766026f468e2918;hp=821f01cd409d2fa092346ed7b8a9454fb64eb27e;hb=b4e3ceb9d379829bc5d6ec799f83086317aeafd8;hpb=6e10c9b924127a50c2c8528cf1908ef634aa5903

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 821f01cd4..12bdf17cd 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -198,19 +198,48 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 	}
 }
 
+static void increment_extended_len(const char *filter_expression,
+		size_t *extended_len)
+{
+	*extended_len += sizeof(struct lttcomm_event_extended_header);
+
+	if (filter_expression) {
+		*extended_len += strlen(filter_expression) + 1;
+	}
+}
+
+static void append_extended_info(const char *filter_expression,
+		void **extended_at)
+{
+	struct lttcomm_event_extended_header extended_header;
+	size_t filter_len = 0;
+
+	if (filter_expression) {
+		filter_len = strlen(filter_expression) + 1;
+	}
+
+	extended_header.filter_len = filter_len;
+	memcpy(*extended_at, &extended_header, sizeof(extended_header));
+	*extended_at += sizeof(extended_header);
+	memcpy(*extended_at, filter_expression, filter_len);
+	*extended_at += filter_len;
+}
+
 /*
  * Create a list of agent domain events.
  *
  * Return number of events in list on success or else a negative value.
  */
 static int list_lttng_agent_events(struct agent *agt,
-		struct lttng_event **events)
+		struct lttng_event **events, size_t *total_size)
 {
 	int i = 0, ret = 0;
 	unsigned int nb_event = 0;
 	struct agent_event *event;
 	struct lttng_event *tmp_events;
 	struct lttng_ht_iter iter;
+	size_t extended_len = 0;
+	void *extended_at;
 
 	assert(agt);
 	assert(events);
@@ -222,16 +251,34 @@ static int list_lttng_agent_events(struct agent *agt,
 	rcu_read_unlock();
 	if (nb_event == 0) {
 		ret = nb_event;
+		*total_size = 0;
 		goto error;
 	}
 
-	tmp_events = zmalloc(nb_event * sizeof(*tmp_events));
+	/* Compute required extended infos size */
+	extended_len = nb_event * sizeof(struct lttcomm_event_extended_header);
+
+	/*
+	 * This is only valid because the commands which add events are
+	 * processed in the same thread as the listing.
+	 */
+	rcu_read_lock();
+	cds_lfht_for_each_entry(agt->events->ht, &iter.iter, event, node.node) {
+		increment_extended_len(event->filter_expression, &extended_len);
+	}
+	rcu_read_unlock();
+
+	*total_size = nb_event * sizeof(*tmp_events) + extended_len;
+	tmp_events = zmalloc(*total_size);
 	if (!tmp_events) {
 		PERROR("zmalloc agent events session");
 		ret = -LTTNG_ERR_FATAL;
 		goto error;
 	}
 
+	extended_at = ((uint8_t *) tmp_events) +
+		nb_event * sizeof(struct lttng_event);
+
 	rcu_read_lock();
 	cds_lfht_for_each_entry(agt->events->ht, &iter.iter, event, node.node) {
 		strncpy(tmp_events[i].name, event->name, sizeof(tmp_events[i].name));
@@ -240,6 +287,9 @@ static int list_lttng_agent_events(struct agent *agt,
 		tmp_events[i].loglevel = event->loglevel_value;
 		tmp_events[i].loglevel_type = event->loglevel_type;
 		i++;
+
+		/* Append extended info */
+		append_extended_info(event->filter_expression, &extended_at);
 	}
 	rcu_read_unlock();
 
@@ -255,7 +305,8 @@ error:
  * Create a list of ust global domain events.
  */
 static int list_lttng_ust_global_events(char *channel_name,
-		struct ltt_ust_domain_global *ust_global, struct lttng_event **events)
+		struct ltt_ust_domain_global *ust_global,
+		struct lttng_event **events, size_t *total_size)
 {
 	int i = 0, ret = 0;
 	unsigned int nb_event = 0;
@@ -264,6 +315,8 @@ static int list_lttng_ust_global_events(char *channel_name,
 	struct ltt_ust_channel *uchan;
 	struct ltt_ust_event *uevent;
 	struct lttng_event *tmp;
+	size_t extended_len = 0;
+	void *extended_at;
 
 	DBG("Listing UST global events for channel %s", channel_name);
 
@@ -281,21 +334,35 @@ static int list_lttng_ust_global_events(char *channel_name,
 	nb_event = lttng_ht_get_count(uchan->events);
 	if (nb_event == 0) {
 		ret = nb_event;
+		*total_size = 0;
 		goto error;
 	}
 
 	DBG3("Listing UST global %d events", nb_event);
 
-	tmp = zmalloc(nb_event * sizeof(struct lttng_event));
+	/* Compute required extended infos size */
+	cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent, node.node) {
+		if (uevent->internal) {
+			nb_event--;
+			continue;
+		}
+
+		increment_extended_len(uevent->filter_expression,
+			&extended_len);
+	}
+
+	*total_size = nb_event * sizeof(struct lttng_event) + extended_len;
+	tmp = zmalloc(*total_size);
 	if (tmp == NULL) {
 		ret = LTTNG_ERR_FATAL;
 		goto error;
 	}
 
+	extended_at = ((uint8_t *) tmp) + nb_event * sizeof(struct lttng_event);
+
 	cds_lfht_for_each_entry(uchan->events->ht, &iter.iter, uevent, node.node) {
 		if (uevent->internal) {
 			/* This event should remain hidden from clients */
-			nb_event--;
 			continue;
 		}
 		strncpy(tmp[i].name, uevent->attr.name, LTTNG_SYMBOL_NAME_LEN);
@@ -333,6 +400,9 @@ static int list_lttng_ust_global_events(char *channel_name,
 			tmp[i].exclusion = 1;
 		}
 		i++;
+
+		/* Append extended info */
+		append_extended_info(uevent->filter_expression, &extended_at);
 	}
 
 	ret = nb_event;
@@ -347,12 +417,15 @@ error:
  * Fill lttng_event array of all kernel events in the channel.
  */
 static int list_lttng_kernel_events(char *channel_name,
-		struct ltt_kernel_session *kernel_session, struct lttng_event **events)
+		struct ltt_kernel_session *kernel_session,
+		struct lttng_event **events, size_t *total_size)
 {
 	int i = 0, ret;
 	unsigned int nb_event;
 	struct ltt_kernel_event *event;
 	struct ltt_kernel_channel *kchan;
+	size_t extended_len = 0;
+	void *extended_at;
 
 	kchan = trace_kernel_get_channel_by_name(channel_name, kernel_session);
 	if (kchan == NULL) {
@@ -365,16 +438,26 @@ static int list_lttng_kernel_events(char *channel_name,
 	DBG("Listing events for channel %s", kchan->channel->name);
 
 	if (nb_event == 0) {
+		*total_size = 0;
 		*events = NULL;
 		goto syscall;
 	}
 
-	*events = zmalloc(nb_event * sizeof(struct lttng_event));
+	/* Compute required extended infos size */
+	cds_list_for_each_entry(event, &kchan->events_list.head, list) {
+		increment_extended_len(event->filter_expression, &extended_len);
+	}
+
+	*total_size = nb_event * sizeof(struct lttng_event) + extended_len;
+	*events = zmalloc(*total_size);
 	if (*events == NULL) {
 		ret = LTTNG_ERR_FATAL;
 		goto error;
 	}
 
+	extended_at = ((uint8_t *) events) +
+		nb_event * sizeof(struct lttng_event);
+
 	/* Kernel channels */
 	cds_list_for_each_entry(event, &kchan->events_list.head , list) {
 		strncpy((*events)[i].name, event->event->name, LTTNG_SYMBOL_NAME_LEN);
@@ -413,6 +496,9 @@ static int list_lttng_kernel_events(char *channel_name,
 			break;
 		}
 		i++;
+
+		/* Append extended info */
+		append_extended_info(event->filter_expression, &extended_at);
 	}
 
 syscall:
@@ -2771,7 +2857,7 @@ error:
  */
 ssize_t cmd_list_events(enum lttng_domain_type domain,
 		struct ltt_session *session, char *channel_name,
-		struct lttng_event **events)
+		struct lttng_event **events, size_t *total_size)
 {
 	int ret = 0;
 	ssize_t nb_event = 0;
@@ -2780,14 +2866,16 @@ ssize_t cmd_list_events(enum lttng_domain_type domain,
 	case LTTNG_DOMAIN_KERNEL:
 		if (session->kernel_session != NULL) {
 			nb_event = list_lttng_kernel_events(channel_name,
-					session->kernel_session, events);
+					session->kernel_session, events,
+					total_size);
 		}
 		break;
 	case LTTNG_DOMAIN_UST:
 	{
 		if (session->ust_session != NULL) {
 			nb_event = list_lttng_ust_global_events(channel_name,
-					&session->ust_session->domain_global, events);
+					&session->ust_session->domain_global, events,
+					total_size);
 		}
 		break;
 	}
@@ -2803,7 +2891,8 @@ ssize_t cmd_list_events(enum lttng_domain_type domain,
 					&iter.iter, agt, node.node) {
 				if (agt->domain == domain) {
 					nb_event = list_lttng_agent_events(
-							agt, events);
+							agt, events,
+							total_size);
 					break;
 				}
 			}