X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=9cb2eb4a695648bfb3f4002248ffdeae3a6d6d64;hp=b47231e00e060ddc58a337f63d96bd5f23ea3e5b;hb=b4e3ceb9d379829bc5d6ec799f83086317aeafd8;hpb=6e10c9b924127a50c2c8528cf1908ef634aa5903

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index b47231e00..9cb2eb4a6 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -1726,6 +1726,10 @@ int lttng_list_events(struct lttng_handle *handle,
 {
 	int ret;
 	struct lttcomm_session_msg lsm;
+	struct lttcomm_event_command_header *cmd_header = NULL;
+	size_t cmd_header_len;
+	uint32_t nb_events, i;
+	void *extended_at;
 
 	/* Safety check. An handle and channel name are mandatory */
 	if (handle == NULL || channel_name == NULL) {
@@ -1738,17 +1742,47 @@ int lttng_list_events(struct lttng_handle *handle,
 			sizeof(lsm.session.name));
 	lttng_ctl_copy_string(lsm.u.list.channel_name, channel_name,
 			sizeof(lsm.u.list.channel_name));
-
 	lttng_ctl_copy_lttng_domain(&lsm.domain, &handle->domain);
 
-	ret = lttng_ctl_ask_sessiond(&lsm, (void**) events);
+	ret = lttng_ctl_ask_sessiond_varlen(&lsm, NULL, 0, (void **) events,
+		(void **) &cmd_header, &cmd_header_len);
 	if (ret < 0) {
-		return ret;
+		goto error;
 	}
 
-	return ret / sizeof(struct lttng_event);
+	/* Set number of events and free command header */
+	nb_events = cmd_header->nb_events;
+	if (nb_events > INT_MAX) {
+		ret = -EOVERFLOW;
+		goto error;
+	}
+	ret = (int) nb_events;
+	free(cmd_header);
+	cmd_header = NULL;
+
+	/* Set extended info pointers */
+	extended_at = ((void*) (*events)) +
+			nb_events * sizeof(struct lttng_event);
+
+	for (i = 0; i < nb_events; i++) {
+		struct lttcomm_event_extended_header *ext_header;
+		struct lttng_event *event = &(*events)[i];
+
+		event->extended.ptr = extended_at;
+		ext_header =
+			(struct lttcomm_event_extended_header *) extended_at;
+		extended_at += sizeof(*ext_header);
+		extended_at += ext_header->filter_len;
+	}
+
+	return ret;
+error:
+	free(cmd_header);
+	free(*events);
+	return ret;
 }
 
+
 /*
  * Sets the tracing_group variable with name.
  * This function allocates memory pointed to by tracing_group.