X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=ee80023fae3710e71bb790d7d81a4fddaf746360;hb=654f9f5e49aae2669d8ae771650b5e2dce5d660f;hp=12bdf17cd9e63f3e4e8c19703766026f468e2918;hpb=b4e3ceb9d379829bc5d6ec799f83086317aeafd8;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 12bdf17cd..ee80023fa 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -199,30 +199,55 @@ static void list_lttng_channels(enum lttng_domain_type domain,
 }
 
 static void increment_extended_len(const char *filter_expression,
-		size_t *extended_len)
+		struct lttng_event_exclusion *exclusion, size_t *extended_len)
 {
 	*extended_len += sizeof(struct lttcomm_event_extended_header);
 
 	if (filter_expression) {
 		*extended_len += strlen(filter_expression) + 1;
 	}
+
+	if (exclusion) {
+		*extended_len += exclusion->count * LTTNG_SYMBOL_NAME_LEN;
+	}
 }
 
 static void append_extended_info(const char *filter_expression,
-		void **extended_at)
+		struct lttng_event_exclusion *exclusion, void **extended_at)
 {
 	struct lttcomm_event_extended_header extended_header;
 	size_t filter_len = 0;
+	size_t nb_exclusions = 0;
 
 	if (filter_expression) {
 		filter_len = strlen(filter_expression) + 1;
 	}
 
+	if (exclusion) {
+		nb_exclusions = exclusion->count;
+	}
+
+	/* Set header fields */
 	extended_header.filter_len = filter_len;
+	extended_header.nb_exclusions = nb_exclusions;
+
+	/* Copy header */
 	memcpy(*extended_at, &extended_header, sizeof(extended_header));
 	*extended_at += sizeof(extended_header);
-	memcpy(*extended_at, filter_expression, filter_len);
-	*extended_at += filter_len;
+
+	/* Copy filter string */
+	if (filter_expression) {
+		memcpy(*extended_at, filter_expression, filter_len);
+		*extended_at += filter_len;
+	}
+
+	/* Copy exclusion names */
+	if (exclusion) {
+		size_t len = nb_exclusions * LTTNG_SYMBOL_NAME_LEN;
+
+		memcpy(*extended_at, &exclusion->names, len);
+		*extended_at += len;
+	}
 }
 
 /*
@@ -264,7 +289,8 @@ static int list_lttng_agent_events(struct agent *agt,
 	 */
 	rcu_read_lock();
 	cds_lfht_for_each_entry(agt->events->ht, &iter.iter, event, node.node) {
-		increment_extended_len(event->filter_expression, &extended_len);
+		increment_extended_len(event->filter_expression, NULL,
+				&extended_len);
 	}
 	rcu_read_unlock();
 
@@ -289,7 +315,8 @@ static int list_lttng_agent_events(struct agent *agt,
 		i++;
 
 		/* Append extended info */
-		append_extended_info(event->filter_expression, &extended_at);
+		append_extended_info(event->filter_expression, NULL,
+				&extended_at);
 	}
 	rcu_read_unlock();
 
@@ -326,7 +353,7 @@ static int list_lttng_ust_global_events(char *channel_name,
 	node = lttng_ht_iter_get_node_str(&iter);
 	if (node == NULL) {
 		ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
-		goto error;
+		goto end;
 	}
 
 	uchan = caa_container_of(&node->node, struct ltt_ust_channel, node.node);
@@ -335,7 +362,7 @@ static int list_lttng_ust_global_events(char *channel_name,
 	if (nb_event == 0) {
 		ret = nb_event;
 		*total_size = 0;
-		goto error;
+		goto end;
 	}
 
 	DBG3("Listing UST global %d events", nb_event);
@@ -348,14 +375,20 @@ static int list_lttng_ust_global_events(char *channel_name,
 		}
 
 		increment_extended_len(uevent->filter_expression,
-			&extended_len);
+			uevent->exclusion, &extended_len);
+	}
+	if (nb_event == 0) {
+		/* All events are internal, skip. */
+		ret = 0;
+		*total_size = 0;
+		goto end;
 	}
 
 	*total_size = nb_event * sizeof(struct lttng_event) + extended_len;
 	tmp = zmalloc(*total_size);
 	if (tmp == NULL) {
-		ret = LTTNG_ERR_FATAL;
-		goto error;
+		ret = -LTTNG_ERR_FATAL;
+		goto end;
 	}
 
 	extended_at = ((uint8_t *) tmp) + nb_event * sizeof(struct lttng_event);
@@ -402,13 +435,13 @@ static int list_lttng_ust_global_events(char *channel_name,
 		i++;
 
 		/* Append extended info */
-		append_extended_info(uevent->filter_expression, &extended_at);
+		append_extended_info(uevent->filter_expression,
+			uevent->exclusion, &extended_at);
 	}
 
 	ret = nb_event;
 	*events = tmp;
-
-error:
+end:
 	rcu_read_unlock();
 	return ret;
 }
@@ -445,7 +478,8 @@ static int list_lttng_kernel_events(char *channel_name,
 
 	/* Compute required extended infos size */
 	cds_list_for_each_entry(event, &kchan->events_list.head, list) {
-		increment_extended_len(event->filter_expression, &extended_len);
+		increment_extended_len(event->filter_expression, NULL,
+			&extended_len);
 	}
 
 	*total_size = nb_event * sizeof(struct lttng_event) + extended_len;
@@ -498,7 +532,8 @@ static int list_lttng_kernel_events(char *channel_name,
 		i++;
 
 		/* Append extended info */
-		append_extended_info(event->filter_expression, &extended_at);
+		append_extended_info(event->filter_expression, NULL,
+			&extended_at);
 	}
 
 syscall: