Fix: Don't notify agent of non-app context addition

[lttng-tools.git] / src / bin / lttng-sessiond / context.c

diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c
index 10352d026952ec3361acccf6aa07ac97bab4b34f..9a5738799192a7a26de2cab6e04b361477ac6bd7 100644 (file)
--- a/src/bin/lttng-sessiond/context.c
+++ b/src/bin/lttng-sessiond/context.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C)  2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 2 only,
@@ -15,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -29,6 +30,7 @@
 #include "kernel.h"
 #include "ust-app.h"
 #include "trace-ust.h"
+#include "agent.h"
 
 /*
  * Add kernel context to all channel.
@@ -87,11 +89,12 @@ error:
 /*
  * Add UST context to channel.
  */
-static int add_uctx_to_channel(struct ltt_ust_session *usess, int domain,
+static int add_uctx_to_channel(struct ltt_ust_session *usess,
+               enum lttng_domain_type domain,
                struct ltt_ust_channel *uchan, struct lttng_event_context *ctx)
 {
        int ret;
-       struct ltt_ust_context *uctx;
+       struct ltt_ust_context *uctx = NULL;
 
        assert(usess);
        assert(uchan);
@@ -104,6 +107,44 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess, int domain,
                        goto duplicate;
                }
        }
+       uctx = NULL;
+
+       switch (domain) {
+       case LTTNG_DOMAIN_JUL:
+       case LTTNG_DOMAIN_LOG4J:
+       {
+               struct agent *agt;
+
+               if (ctx->ctx != LTTNG_EVENT_CONTEXT_APP_CONTEXT) {
+                       /* Other contexts are not needed by the agent. */
+                       break;
+               }
+               agt = trace_ust_find_agent(usess, domain);
+
+               if (!agt) {
+                       agt = agent_create(domain);
+                       if (!agt) {
+                               ret = LTTNG_ERR_NOMEM;
+                               goto error;
+                       }
+                       agent_add(agt, usess->agents);
+               }
+               ret = agent_add_context(ctx, agt);
+               if (ret != LTTNG_OK) {
+                       goto error;
+               }
+
+               ret = agent_enable_context(ctx, domain);
+               if (ret != LTTNG_OK) {
+                       goto error;
+               }
+               break;
+       }
+       case LTTNG_DOMAIN_UST:
+               break;
+       default:
+               assert(0);
+       }
 
        /* Create ltt UST context */
        uctx = trace_ust_create_context(ctx);
@@ -112,15 +153,8 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess, int domain,
                goto error;
        }
 
-       switch (domain) {
-       case LTTNG_DOMAIN_UST:
-               ret = ust_app_add_ctx_channel_glb(usess, uchan, uctx);
-               if (ret < 0) {
-                       goto error;
-               }
-               break;
-       default:
-               ret = -ENOSYS;
+       ret = ust_app_add_ctx_channel_glb(usess, uchan, uctx);
+       if (ret < 0) {
                goto error;
        }
 
@@ -198,7 +232,8 @@ int context_kernel_add(struct ltt_kernel_session *ksession,
                kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER;
                break;
        default:
-               return LTTNG_ERR_KERN_CONTEXT_FAIL;
+               ret = LTTNG_ERR_KERN_CONTEXT_FAIL;
+               goto error;
        }
 
        kctx->ctx.u.perf_counter.type = ctx->u.perf_counter.type;
@@ -226,17 +261,21 @@ int context_kernel_add(struct ltt_kernel_session *ksession,
                }
        }
 
-       ret = LTTNG_OK;
+       return LTTNG_OK;
 
 error:
+       if (kctx) {
+               trace_kernel_destroy_context(kctx);
+       }
        return ret;
 }
 
 /*
  * Add UST context to tracer.
  */
-int context_ust_add(struct ltt_ust_session *usess, int domain,
-               struct lttng_event_context *ctx, char *channel_name)
+int context_ust_add(struct ltt_ust_session *usess,
+               enum lttng_domain_type domain, struct lttng_event_context *ctx,
+               char *channel_name)
 {
        int ret = LTTNG_OK;
        struct lttng_ht_iter iter;
@@ -249,23 +288,7 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
 
        rcu_read_lock();
 
-       /*
-        * Define which channel's hashtable to use from the domain or quit if
-        * unknown domain.
-        */
-       switch (domain) {
-       case LTTNG_DOMAIN_UST:
-               chan_ht = usess->domain_global.channels;
-               break;
-#if 0
-       case LTTNG_DOMAIN_UST_EXEC_NAME:
-       case LTTNG_DOMAIN_UST_PID:
-       case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
-       default:
-               ret = LTTNG_ERR_UND;
-               goto error;
-       }
+       chan_ht = usess->domain_global.channels;
 
        /* Get UST channel if defined */
        if (channel_name[0] != '\0') {
@@ -285,7 +308,8 @@ int context_ust_add(struct ltt_ust_session *usess, int domain,
                cds_lfht_for_each_entry(chan_ht->ht, &iter.iter, uchan, node.node) {
                        ret = add_uctx_to_channel(usess, domain, uchan, ctx);
                        if (ret < 0) {
-                               ERR("Context failed for channel %s", uchan->name);
+                               ERR("Failed to add context to channel %s",
+                                               uchan->name);
                                continue;
                        }
                }