X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.c;h=5cb8336c361d4377973b365608ec603597564afe;hb=0e1155633b00241b8b1e5a9bb683cf91b28f5eeb;hp=dbeec9dabf5a387a1a78fefd25c866cc61ee1b80;hpb=fefd409b002735b415c5f653cdb2587be454f145;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index dbeec9dab..5cb8336c3 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -528,7 +528,8 @@ error:
  *
  * Return the number of events or else a negative value.
  */
-int agent_list_events(struct lttng_event **events)
+int agent_list_events(struct lttng_event **events,
+		enum lttng_domain_type domain)
 {
 	int ret;
 	size_t nbmem, count = 0;
@@ -538,6 +539,8 @@ int agent_list_events(struct lttng_event **events)
 
 	assert(events);
 
+	DBG2("Agent listing events for domain %d", domain);
+
 	nbmem = UST_APP_EVENT_LIST_SIZE;
 	tmp_events = zmalloc(nbmem * sizeof(*tmp_events));
 	if (!tmp_events) {
@@ -552,6 +555,11 @@ int agent_list_events(struct lttng_event **events)
 		ssize_t nb_ev;
 		struct lttng_event *agent_events;
 
+		/* Skip domain not asked by the list. */
+		if (app->domain != domain) {
+			continue;
+		}
+
 		nb_ev = list_events(app, &agent_events);
 		if (nb_ev < 0) {
 			ret = nb_ev;
@@ -763,6 +771,7 @@ struct agent *agent_create(enum lttng_domain_type domain)
 	ret = agent_init(agt);
 	if (ret < 0) {
 		free(agt);
+		agt = NULL;
 		goto error;
 	}