Add the support for multiple agent

For this, a new field has been added to the register message, the domain
type. Agent object and agent application object have now a domain type
so we can enable/disable the right event for the right agent for a
client command or during an application registration.

The "jevent" name has been renamed to "aevent" so further remove the
concept of Java event.

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

diff --git a/src/bin/lttng-sessiond/agent-thread.c b/src/bin/lttng-sessiond/agent-thread.c
index da0171ba0afadf7ff883b7545e823b3dab346c48..6790a63c642bd78bb37484a6c6af0b1af39081c7 100644 (file)
--- a/src/bin/lttng-sessiond/agent-thread.c
+++ b/src/bin/lttng-sessiond/agent-thread.c
@@ -46,7 +46,7 @@ static const char *default_reg_uri =
  * This is a quite heavy call in terms of locking since the session list lock
  * AND session lock are acquired.
  */
-static void update_agent_app(int sock)
+static void update_agent_app(struct agent_app *app)
 {
        struct ltt_session *session, *stmp;
        struct ltt_session_list *list;
@@ -58,7 +58,12 @@ static void update_agent_app(int sock)
        cds_list_for_each_entry_safe(session, stmp, &list->head, list) {
                session_lock(session);
                if (session->ust_session) {
-                       agent_update(&session->ust_session->agent, sock);
+                       struct agent *agt;
+
+                       agt = trace_ust_find_agent(session->ust_session, app->domain);
+                       if (agt) {
+                               agent_update(agt, app->sock->fd);
+                       }
                }
                session_unlock(session);
        }
@@ -194,6 +199,7 @@ static int handle_registration(struct lttcomm_sock *reg_sock,
        int ret;
        pid_t pid;
        ssize_t size;
+       enum lttng_domain_type domain;
        struct agent_app *app;
        struct agent_register_msg msg;
        struct lttcomm_sock *new_sock;
@@ -211,12 +217,13 @@ static int handle_registration(struct lttcomm_sock *reg_sock,
                ret = -errno;
                goto error_socket;
        }
+       domain = be32toh(msg.domain);
        pid = be32toh(msg.pid);
 
-       DBG2("[agent-thread] New registration for pid %d on socket %d", pid,
-                       new_sock->fd);
+       DBG2("[agent-thread] New registration for pid %d domain %d on socket %d",
+                       pid, domain, new_sock->fd);
 
-       app = agent_create_app(pid, new_sock);
+       app = agent_create_app(pid, domain, new_sock);
        if (!app) {
                ret = -ENOMEM;
                goto error_socket;
@@ -350,7 +357,7 @@ restart:
                                }
 
                                /* Update newly registered app. */
-                               update_agent_app(new_fd);
+                               update_agent_app(app);
 
                                /* On failure, the poll will detect it and clean it up. */
                                (void) agent_send_registration_done(app);

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index cf8264a307b7029f479b779dd846221212922567..dbeec9dabf5a387a1a78fefd25c866cc61ee1b80 100644 (file)
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -452,7 +452,8 @@ int agent_send_registration_done(struct agent_app *app)
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-int agent_enable_event(struct agent_event *event)
+int agent_enable_event(struct agent_event *event,
+               enum lttng_domain_type domain)
 {
        int ret;
        struct agent_app *app;
@@ -464,6 +465,10 @@ int agent_enable_event(struct agent_event *event)
 
        cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, app,
                        node.node) {
+               if (app->domain != domain) {
+                       continue;
+               }
+
                /* Enable event on agent application through TCP socket. */
                ret = enable_event(app, event);
                if (ret != LTTNG_OK) {
@@ -485,7 +490,8 @@ error:
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-int agent_disable_event(struct agent_event *event)
+int agent_disable_event(struct agent_event *event,
+               enum lttng_domain_type domain)
 {
        int ret;
        struct agent_app *app;
@@ -497,6 +503,10 @@ int agent_disable_event(struct agent_event *event)
 
        cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, app,
                        node.node) {
+               if (app->domain != domain) {
+                       continue;
+               }
+
                /* Enable event on agent application through TCP socket. */
                ret = disable_event(app, event);
                if (ret != LTTNG_OK) {
@@ -593,7 +603,8 @@ error:
  *
  * Return newly allocated object or else NULL on error.
  */
-struct agent_app *agent_create_app(pid_t pid, struct lttcomm_sock *sock)
+struct agent_app *agent_create_app(pid_t pid, enum lttng_domain_type domain,
+               struct lttcomm_sock *sock)
 {
        struct agent_app *app;
 
@@ -606,6 +617,7 @@ struct agent_app *agent_create_app(pid_t pid, struct lttcomm_sock *sock)
        }
 
        app->pid = pid;
+       app->domain = domain;
        app->sock = sock;
        lttng_ht_node_init_ulong(&app->node, (unsigned long) app->sock->fd);
 
@@ -709,6 +721,7 @@ int agent_init(struct agent *agt)
                ret = -ENOMEM;
                goto error;
        }
+       lttng_ht_node_init_u64(&agt->node, agt->domain);
 
        return 0;
 
@@ -716,6 +729,47 @@ error:
        return ret;
 }
 
+/*
+ * Add agent object to the given hash table.
+ */
+void agent_add(struct agent *agt, struct lttng_ht *ht)
+{
+       assert(agt);
+       assert(ht);
+
+       DBG3("Agent adding from domain %d", agt->domain);
+
+       rcu_read_lock();
+       lttng_ht_add_unique_u64(ht, &agt->node);
+       rcu_read_unlock();
+}
+
+/*
+ * Create an agent object for the given domain.
+ *
+ * Return the allocated agent or NULL on error.
+ */
+struct agent *agent_create(enum lttng_domain_type domain)
+{
+       int ret;
+       struct agent *agt;
+
+       agt = zmalloc(sizeof(*agt));
+       if (!agt) {
+               goto error;
+       }
+       agt->domain = domain;
+
+       ret = agent_init(agt);
+       if (ret < 0) {
+               free(agt);
+               goto error;
+       }
+
+error:
+       return agt;
+}
+
 /*
  * Create a newly allocated agent event data structure. If name is valid, it's
  * copied into the created event.

diff --git a/src/bin/lttng-sessiond/agent.h b/src/bin/lttng-sessiond/agent.h
index 404365e0a5e4051e595788e1a72a71952c419c2a..3dbf7179aa8547e28a3c7d5351896a5ced24b17b 100644 (file)
--- a/src/bin/lttng-sessiond/agent.h
+++ b/src/bin/lttng-sessiond/agent.h
@@ -40,6 +40,8 @@ struct agent_ht_key {
  * find back the corresponding UST app object so both socket can be linked.
  */
 struct agent_register_msg {
+       /* This maps to a lttng_domain_type. */
+       uint32_t domain;
        uint32_t pid;
 };
 
@@ -54,6 +56,9 @@ struct agent_app {
         */
        pid_t pid;
 
+       /* Domain of the application. */
+       enum lttng_domain_type domain;
+
        /*
         * AGENT TCP socket that was created upon registration.
         */
@@ -95,8 +100,15 @@ struct agent {
         * actually enabled.
         */
        unsigned int being_used:1;
+
+       /* What domain this agent is. */
+       enum lttng_domain_type domain;
+
        /* Contains event indexed by name. */
        struct lttng_ht *events;
+
+       /* Node used for the hash table indexed by domain type. */
+       struct lttng_ht_node_u64 node;
 };
 
 /* Setup agent subsystem. */
@@ -104,7 +116,9 @@ int agent_setup(void);
 
 /* Initialize an already allocated agent domain. */
 int agent_init(struct agent *agt);
+struct agent *agent_create(enum lttng_domain_type domain);
 void agent_destroy(struct agent *agt);
+void agent_add(struct agent *agt, struct lttng_ht *ht);
 
 /* Agent event API. */
 struct agent_event *agent_create_event(const char *name,
@@ -119,7 +133,8 @@ void agent_delete_event(struct agent_event *event, struct agent *agt);
 void agent_destroy_event(struct agent_event *event);
 
 /* Agent app API. */
-struct agent_app *agent_create_app(pid_t pid, struct lttcomm_sock *sock);
+struct agent_app *agent_create_app(pid_t pid, enum lttng_domain_type domain,
+               struct lttcomm_sock *sock);
 void agent_add_app(struct agent_app *app);
 void agent_delete_app(struct agent_app *app);
 struct agent_app *agent_find_app_by_sock(int sock);
@@ -127,8 +142,10 @@ void agent_destroy_app(struct agent_app *app);
 int agent_send_registration_done(struct agent_app *app);
 
 /* Agent action API */
-int agent_enable_event(struct agent_event *event);
-int agent_disable_event(struct agent_event *event);
+int agent_enable_event(struct agent_event *event,
+               enum lttng_domain_type domain);
+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);
 

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index d518449c058389d1c6930fac2b9356d636750502..d0dcda171e7588bac957cc5c5fada29b799e1a9f 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -1073,11 +1073,18 @@ int cmd_disable_event(struct ltt_session *session, int domain,
        }
        case LTTNG_DOMAIN_JUL:
        {
+               struct agent *agt;
                struct ltt_ust_session *usess = session->ust_session;
 
                assert(usess);
 
-               ret = event_agent_disable(usess, event_name);
+               agt = trace_ust_find_agent(usess, LTTNG_DOMAIN_JUL);
+               if (!agt) {
+                       ret = -LTTNG_ERR_UST_EVENT_NOT_FOUND;
+                       goto error;
+               }
+
+               ret = event_agent_disable(usess, agt, event_name);
                if (ret != LTTNG_OK) {
                        goto error;
                }
@@ -1178,11 +1185,18 @@ int cmd_disable_event_all(struct ltt_session *session, int domain,
        }
        case LTTNG_DOMAIN_JUL:
        {
+               struct agent *agt;
                struct ltt_ust_session *usess = session->ust_session;
 
                assert(usess);
 
-               ret = event_agent_disable_all(usess);
+               agt = trace_ust_find_agent(usess, LTTNG_DOMAIN_JUL);
+               if (!agt) {
+                       ret = -LTTNG_ERR_UST_EVENT_NOT_FOUND;
+                       goto error;
+               }
+
+               ret = event_agent_disable_all(usess, agt);
                if (ret != LTTNG_OK) {
                        goto error;
                }
@@ -1468,12 +1482,23 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
        }
        case LTTNG_DOMAIN_JUL:
        {
+               struct agent *agt;
                struct lttng_event uevent;
                struct lttng_domain tmp_dom;
                struct ltt_ust_session *usess = session->ust_session;
 
                assert(usess);
 
+               agt = trace_ust_find_agent(usess, LTTNG_DOMAIN_JUL);
+               if (!agt) {
+                       agt = agent_create(LTTNG_DOMAIN_JUL);
+                       if (!agt) {
+                               ret = -LTTNG_ERR_NOMEM;
+                               goto error;
+                       }
+                       agent_add(agt, usess->agents);
+               }
+
                /* Create the default tracepoint. */
                memset(&uevent, 0, sizeof(uevent));
                uevent.type = LTTNG_EVENT_TRACEPOINT;
@@ -1503,9 +1528,9 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 
                /* The wild card * means that everything should be enabled. */
                if (strncmp(event->name, "*", 1) == 0 && strlen(event->name) == 1) {
-                       ret = event_agent_enable_all(usess, event, filter);
+                       ret = event_agent_enable_all(usess, agt, event, filter);
                } else {
-                       ret = event_agent_enable(usess, event, filter);
+                       ret = event_agent_enable(usess, agt, event, filter);
                }
                if (ret != LTTNG_OK) {
                        goto error;
@@ -1689,12 +1714,23 @@ int cmd_enable_event_all(struct ltt_session *session,
        }
        case LTTNG_DOMAIN_JUL:
        {
+               struct agent *agt;
                struct lttng_event uevent, event;
                struct lttng_domain tmp_dom;
                struct ltt_ust_session *usess = session->ust_session;
 
                assert(usess);
 
+               agt = trace_ust_find_agent(usess, LTTNG_DOMAIN_JUL);
+               if (!agt) {
+                       agt = agent_create(LTTNG_DOMAIN_JUL);
+                       if (!agt) {
+                               ret = -LTTNG_ERR_NOMEM;
+                               goto error;
+                       }
+                       agent_add(agt, usess->agents);
+               }
+
                /* Create the default tracepoint. */
                uevent.type = LTTNG_EVENT_TRACEPOINT;
                uevent.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
@@ -1726,7 +1762,7 @@ int cmd_enable_event_all(struct ltt_session *session,
                strncpy(event.name, "*", sizeof(event.name));
                event.name[sizeof(event.name) - 1] = '\0';
 
-               ret = event_agent_enable_all(usess, &event, filter);
+               ret = event_agent_enable_all(usess, agt, &event, filter);
                if (ret != LTTNG_OK) {
                        goto error;
                }
@@ -2370,6 +2406,8 @@ ssize_t cmd_list_domains(struct ltt_session *session,
 {
        int ret, index = 0;
        ssize_t nb_dom = 0;
+       struct agent *agt;
+       struct lttng_ht_iter iter;
 
        if (session->kernel_session != NULL) {
                DBG3("Listing domains found kernel domain");
@@ -2380,8 +2418,11 @@ ssize_t cmd_list_domains(struct ltt_session *session,
                DBG3("Listing domains found UST global domain");
                nb_dom++;
 
-               if (session->ust_session->agent.being_used) {
-                       nb_dom++;
+               cds_lfht_for_each_entry(session->ust_session->agents->ht, &iter.iter,
+                               agt, node.node) {
+                       if (agt->being_used) {
+                               nb_dom++;
+                       }
                }
        }
 
@@ -2401,10 +2442,13 @@ ssize_t cmd_list_domains(struct ltt_session *session,
                (*domains)[index].buf_type = session->ust_session->buffer_type;
                index++;
 
-               if (session->ust_session->agent.being_used) {
-                       (*domains)[index].type = LTTNG_DOMAIN_JUL;
-                       (*domains)[index].buf_type = session->ust_session->buffer_type;
-                       index++;
+               cds_lfht_for_each_entry(session->ust_session->agents->ht, &iter.iter,
+                               agt, node.node) {
+                       if (agt->being_used) {
+                               (*domains)[index].type = agt->domain;
+                               (*domains)[index].buf_type = session->ust_session->buffer_type;
+                               index++;
+                       }
                }
        }
 
@@ -2498,8 +2542,13 @@ ssize_t cmd_list_events(int domain, struct ltt_session *session,
        }
        case LTTNG_DOMAIN_JUL:
                if (session->ust_session) {
-                       nb_event = list_lttng_agent_events(
-                                       &session->ust_session->agent, events);
+                       struct lttng_ht_iter iter;
+                       struct agent *agt;
+
+                       cds_lfht_for_each_entry(session->ust_session->agents->ht,
+                                       &iter.iter, agt, node.node) {
+                               nb_event = list_lttng_agent_events(agt, events);
+                       }
                }
                break;
        default:

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 80721a78848ef7850fb2162cb11157119fb58ffa..52fd9f5478a753492eb9ffee7b0c6d8eaf18d5e4 100644 (file)
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -622,10 +622,11 @@ error:
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
 int event_agent_enable_all(struct ltt_ust_session *usess,
-               struct lttng_event *event, struct lttng_filter_bytecode *filter)
+               struct agent *agt, struct lttng_event *event,
+               struct lttng_filter_bytecode *filter)
 {
        int ret;
-       struct agent_event *jevent;
+       struct agent_event *aevent;
        struct lttng_ht_iter iter;
 
        assert(usess);
@@ -633,16 +634,16 @@ int event_agent_enable_all(struct ltt_ust_session *usess,
        DBG("Event agent enabling ALL events for session %" PRIu64, usess->id);
 
        /* Enable event on agent application through TCP socket. */
-       ret = event_agent_enable(usess, event, filter);
+       ret = event_agent_enable(usess, agt, event, filter);
        if (ret != LTTNG_OK) {
                goto error;
        }
 
        /* Flag every event that they are now enabled. */
        rcu_read_lock();
-       cds_lfht_for_each_entry(usess->agent.events->ht, &iter.iter, jevent,
+       cds_lfht_for_each_entry(agt->events->ht, &iter.iter, aevent,
                        node.node) {
-               jevent->enabled = 1;
+               aevent->enabled = 1;
        }
        rcu_read_unlock();
 
@@ -657,44 +658,46 @@ error:
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-int event_agent_enable(struct ltt_ust_session *usess, struct lttng_event *event,
+int event_agent_enable(struct ltt_ust_session *usess,
+               struct agent *agt, struct lttng_event *event,
                struct lttng_filter_bytecode *filter)
 {
        int ret, created = 0;
-       struct agent_event *jevent;
+       struct agent_event *aevent;
 
        assert(usess);
        assert(event);
+       assert(agt);
 
        DBG("Event agent enabling %s for session %" PRIu64 " with loglevel type %d "
                        "and loglevel %d", event->name, usess->id, event->loglevel_type,
                        event->loglevel);
 
-       jevent = agent_find_event(event->name, event->loglevel, &usess->agent);
-       if (!jevent) {
-               jevent = agent_create_event(event->name, filter);
-               if (!jevent) {
+       aevent = agent_find_event(event->name, event->loglevel, agt);
+       if (!aevent) {
+               aevent = agent_create_event(event->name, filter);
+               if (!aevent) {
                        ret = LTTNG_ERR_NOMEM;
                        goto error;
                }
-               jevent->loglevel = event->loglevel;
-               jevent->loglevel_type = event->loglevel_type;
+               aevent->loglevel = event->loglevel;
+               aevent->loglevel_type = event->loglevel_type;
                created = 1;
        }
 
        /* Already enabled? */
-       if (jevent->enabled) {
+       if (aevent->enabled) {
                goto end;
        }
 
-       ret = agent_enable_event(jevent);
+       ret = agent_enable_event(aevent, agt->domain);
        if (ret != LTTNG_OK) {
                goto error;
        }
 
        /* If the event was created prior to the enable, add it to the domain. */
        if (created) {
-               agent_add_event(jevent, &usess->agent);
+               agent_add_event(aevent, agt);
        }
 
 end:
@@ -702,7 +705,7 @@ end:
 
 error:
        if (created) {
-               agent_destroy_event(jevent);
+               agent_destroy_event(aevent);
        }
        return ret;
 }
@@ -712,27 +715,29 @@ error:
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-int event_agent_disable(struct ltt_ust_session *usess, char *event_name)
+int event_agent_disable(struct ltt_ust_session *usess, struct agent *agt,
+               char *event_name)
 {
        int ret;
-       struct agent_event *jevent;
+       struct agent_event *aevent;
        struct ltt_ust_event *uevent = NULL;
        struct ltt_ust_channel *uchan = NULL;
        char *ust_event_name;
 
+       assert(agt);
        assert(usess);
        assert(event_name);
 
        DBG("Event agent disabling %s for session %" PRIu64, event_name, usess->id);
 
-       jevent = agent_find_event_by_name(event_name, &usess->agent);
-       if (!jevent) {
+       aevent = agent_find_event_by_name(event_name, agt);
+       if (!aevent) {
                ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
                goto error;
        }
 
        /* Already disabled? */
-       if (!jevent->enabled) {
+       if (!aevent->enabled) {
                goto end;
        }
 
@@ -759,7 +764,7 @@ int event_agent_disable(struct ltt_ust_session *usess, char *event_name)
         * filter is the one handling the loglevel for agent.
         */
        uevent = trace_ust_find_event(uchan->events, ust_event_name,
-                       jevent->filter, 0, NULL);
+                       aevent->filter, 0, NULL);
        /* If the agent event exists, it must be available on the UST side. */
        assert(uevent);
 
@@ -769,7 +774,7 @@ int event_agent_disable(struct ltt_ust_session *usess, char *event_name)
                goto error;
        }
 
-       ret = agent_disable_event(jevent);
+       ret = agent_disable_event(aevent, agt->domain);
        if (ret != LTTNG_OK) {
                goto error;
        }
@@ -785,16 +790,18 @@ error:
  *
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
-int event_agent_disable_all(struct ltt_ust_session *usess)
+int event_agent_disable_all(struct ltt_ust_session *usess,
+               struct agent *agt)
 {
        int ret, do_disable = 0;
-       struct agent_event *jevent;
+       struct agent_event *aevent;
        struct lttng_ht_iter iter;
 
+       assert(agt);
        assert(usess);
 
-       /* Enable event on agent application through TCP socket. */
-       ret = event_agent_disable(usess, "*");
+       /* Disable event on agent application through TCP socket. */
+       ret = event_agent_disable(usess, agt, "*");
        if (ret != LTTNG_OK) {
                if (ret == LTTNG_ERR_UST_EVENT_NOT_FOUND) {
                        /*
@@ -810,16 +817,16 @@ int event_agent_disable_all(struct ltt_ust_session *usess)
 
        /* Flag every event that they are now enabled. */
        rcu_read_lock();
-       cds_lfht_for_each_entry(usess->agent.events->ht, &iter.iter, jevent,
+       cds_lfht_for_each_entry(agt->events->ht, &iter.iter, aevent,
                        node.node) {
-               if (jevent->enabled && do_disable) {
-                       ret = event_agent_disable(usess, jevent->name);
+               if (aevent->enabled && do_disable) {
+                       ret = event_agent_disable(usess, agt, aevent->name);
                        if (ret != LTTNG_OK) {
                                rcu_read_unlock();
                                goto error;
                        }
                }
-               jevent->enabled = 0;
+               aevent->enabled = 0;
        }
        rcu_read_unlock();
 

diff --git a/src/bin/lttng-sessiond/event.h b/src/bin/lttng-sessiond/event.h
index 7a87c3521fb8b0f29c68dfdc9ed0487d203e48d4..c14c00595a9311b402816d25955dc88bb05a35b0 100644 (file)
--- a/src/bin/lttng-sessiond/event.h
+++ b/src/bin/lttng-sessiond/event.h
@@ -18,6 +18,7 @@
 #ifndef _LTT_EVENT_H
 #define _LTT_EVENT_H
 
+#include "agent.h"
 #include "trace-kernel.h"
 
 int event_kernel_disable_tracepoint(struct ltt_kernel_channel *kchan,
@@ -49,12 +50,13 @@ int event_ust_enable_all_tracepoints(struct ltt_ust_session *usess,
 int event_ust_disable_all_tracepoints(struct ltt_ust_session *usess,
                struct ltt_ust_channel *uchan);
 
-int event_agent_enable(struct ltt_ust_session *usess, struct lttng_event *event,
-               struct lttng_filter_bytecode *filter);
-int event_agent_enable_all(struct ltt_ust_session *usess,
+int event_agent_enable(struct ltt_ust_session *usess, struct agent *agt,
+               struct lttng_event *event, struct lttng_filter_bytecode *filter);
+int event_agent_enable_all(struct ltt_ust_session *usess, struct agent *agt,
                struct lttng_event *event, struct lttng_filter_bytecode *filter);
 
-int event_agent_disable(struct ltt_ust_session *usess, char *event_name);
-int event_agent_disable_all(struct ltt_ust_session *usess);
+int event_agent_disable(struct ltt_ust_session *usess, struct agent *agt,
+               char *event_name);
+int event_agent_disable_all(struct ltt_ust_session *usess, struct agent *agt);
 
 #endif /* _LTT_EVENT_H */

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index e92ed8d88c2020015041556de8487e710614e415..2aefae03e2cc66ceb4163bfee4d4948c7095ef76 100644 (file)
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -1139,7 +1139,7 @@ int save_domains(struct config_writer *writer, struct ltt_session *session)
        }
 
        if (session->ust_session &&
-               session->ust_session->agent.being_used) {
+                       lttng_ht_get_count(session->ust_session->agents) > 0) {
                ret = config_writer_open_element(writer,
                        config_element_domain);
                if (ret) {

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 9c22e38901144a00041d6176d5d5ef887777e5e2..1f6fd52736abe4f8abde125fdc092601d491ec46 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -199,6 +199,35 @@ error:
        return NULL;
 }
 
+/*
+ * Lookup an agent in the session agents hash table by domain type and return
+ * the object if found else NULL.
+ */
+struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
+               enum lttng_domain_type domain_type)
+{
+       struct agent *agt = NULL;
+       struct lttng_ht_node_u64 *node;
+       struct lttng_ht_iter iter;
+       uint64_t key;
+
+       assert(session);
+
+       DBG3("Trace ust agent lookup for domain %d", domain_type);
+
+       key = domain_type;
+
+       lttng_ht_lookup(session->agents, &key, &iter);
+       node = lttng_ht_iter_get_node_u64(&iter);
+       if (!node) {
+               goto end;
+       }
+       agt = caa_container_of(node, struct agent, node);
+
+end:
+       return agt;
+}
+
 /*
  * Allocate and initialize a ust session data structure.
  *
@@ -206,7 +235,6 @@ error:
  */
 struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
 {
-       int ret;
        struct ltt_ust_session *lus;
 
        /* Allocate a new ltt ust session */
@@ -242,10 +270,8 @@ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
 
        /* Alloc UST global domain channels' HT */
        lus->domain_global.channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
-       ret = agent_init(&lus->agent);
-       if (ret < 0) {
-               goto error_consumer;
-       }
+       /* Alloc agent hash table. */
+       lus->agents = lttng_ht_new(0, LTTNG_HT_TYPE_U64);
 
        lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
        if (lus->consumer == NULL) {
@@ -266,7 +292,7 @@ struct ltt_ust_session *trace_ust_create_session(uint64_t session_id)
 
 error_consumer:
        ht_cleanup_push(lus->domain_global.channels);
-       agent_destroy(&lus->agent);
+       ht_cleanup_push(lus->agents);
        free(lus);
 error:
        return NULL;
@@ -712,7 +738,9 @@ static void destroy_domain_global(struct ltt_ust_domain_global *dom)
  */
 void trace_ust_destroy_session(struct ltt_ust_session *session)
 {
+       struct agent *agt;
        struct buffer_reg_uid *reg, *sreg;
+       struct lttng_ht_iter iter;
 
        assert(session);
 
@@ -720,7 +748,11 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
 
        /* Cleaning up UST domain */
        destroy_domain_global(&session->domain_global);
-       agent_destroy(&session->agent);
+
+       cds_lfht_for_each_entry(session->agents->ht, &iter.iter, agt, node.node) {
+               lttng_ht_del(session->agents, &iter);
+               agent_destroy(agt);
+       }
 
        /* Cleanup UID buffer registry object(s). */
        cds_list_for_each_entry_safe(reg, sreg, &session->buffer_reg_uid_list,

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index d58e37121696e3a4fda50fe0990316de7950229b..795389e9da3f34e55c6eae7fc7bffc46c4b09c80 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -78,7 +78,8 @@ struct ltt_ust_domain_global {
 struct ltt_ust_session {
        uint64_t id;    /* Unique identifier of session */
        struct ltt_ust_domain_global domain_global;
-       struct agent agent;
+       /* Hash table of agent indexed by agent domain. */
+       struct lttng_ht *agents;
        /* UID/GID of the user owning the session */
        uid_t uid;
        gid_t gid;
@@ -157,6 +158,8 @@ struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
                struct lttng_event_exclusion *exclusion);
 struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
                char *name);
+struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
+               enum lttng_domain_type domain_type);
 
 /*
  * Create functions malloc() the data structure.
@@ -257,6 +260,12 @@ void trace_ust_delete_channel(struct lttng_ht *ht,
 {
        return;
 }
+static inline
+struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
+               enum lttng_domain_type domain_type)
+{
+       return NULL;
+}
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */