Fix: list agent event per domain only

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index dbeec9dabf5a387a1a78fefd25c866cc61ee1b80..b267503fcbcec3e58890fda360c507496645afe6 100644 (file)
--- 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;
@@ -552,6 +553,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;

diff --git a/src/bin/lttng-sessiond/agent.h b/src/bin/lttng-sessiond/agent.h
index 3dbf7179aa8547e28a3c7d5351896a5ced24b17b..f8d9ca6ea5b35eabac13c6182e0a3c6a5bca2966 100644 (file)
--- a/src/bin/lttng-sessiond/agent.h
+++ b/src/bin/lttng-sessiond/agent.h
@@ -147,6 +147,7 @@ int agent_enable_event(struct agent_event *event,
 int agent_disable_event(struct agent_event *event,
                enum lttng_domain_type domain);
 void agent_update(struct agent *agt, int sock);
-int agent_list_events(struct lttng_event **events);
+int agent_list_events(struct lttng_event **events,
+               enum lttng_domain_type domain);
 
 #endif /* LTTNG_SESSIOND_AGENT_H */

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index bacaa5caab1b6c36741ec4151cea0338e5c84b27..628fb1061da0492089dff7f332df15b7a4bc6906 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1816,7 +1816,7 @@ ssize_t cmd_list_tracepoints(int domain, struct lttng_event **events)
                break;
        case LTTNG_DOMAIN_LOG4J:
        case LTTNG_DOMAIN_JUL:
-               nb_events = agent_list_events(events);
+               nb_events = agent_list_events(events, domain);
                if (nb_events < 0) {
                        ret = LTTNG_ERR_UST_LIST_FAIL;
                        goto error;