/*
- * 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,
* 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>
#include "kernel.h"
#include "ust-app.h"
#include "trace-ust.h"
+#include "agent.h"
/*
* Add kernel context to all channel.
*/
static int add_kctx_all_channels(struct ltt_kernel_session *ksession,
- struct lttng_kernel_context *kctx)
+ struct ltt_kernel_context *kctx)
{
int ret;
struct ltt_kernel_channel *kchan;
/*
* Add kernel context to a specific channel.
*/
-static int add_kctx_to_channel(struct lttng_kernel_context *kctx,
+static int add_kctx_to_channel(struct ltt_kernel_context *kctx,
struct ltt_kernel_channel *kchan)
{
int ret;
/*
* 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 lttng_ht_iter iter;
- struct lttng_ht_node_ulong *uctx_node;
+ struct ltt_ust_context *uctx = NULL;
assert(usess);
assert(uchan);
assert(ctx);
- /* Create ltt UST context */
- uctx = trace_ust_create_context(ctx);
- if (uctx == NULL) {
- ret = -EINVAL;
- goto error;
+ /* Check if context is duplicate */
+ cds_list_for_each_entry(uctx, &uchan->ctx_list, list) {
+ if (trace_ust_match_context(uctx, ctx)) {
+ ret = -EEXIST;
+ goto duplicate;
+ }
}
+ uctx = NULL;
switch (domain) {
- case LTTNG_DOMAIN_UST:
- ret = ust_app_add_ctx_channel_glb(usess, uchan, uctx);
- if (ret < 0) {
+ 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:
- ret = -ENOSYS;
- goto error;
+ assert(0);
}
- rcu_read_lock();
+ /* Create ltt UST context */
+ uctx = trace_ust_create_context(ctx);
+ if (uctx == NULL) {
+ ret = -EINVAL;
+ goto error;
+ }
- /* Lookup context before adding it */
- lttng_ht_lookup(uchan->ctx, (void *)((unsigned long)uctx->ctx.ctx), &iter);
- uctx_node = lttng_ht_iter_get_node_ulong(&iter);
- if (uctx_node != NULL) {
- ret = -EEXIST;
- rcu_read_unlock();
+ ret = ust_app_add_ctx_channel_glb(usess, uchan, uctx);
+ if (ret < 0) {
goto error;
}
+ rcu_read_lock();
+
/* Add ltt UST context node to ltt UST channel */
- lttng_ht_add_unique_ulong(uchan->ctx, &uctx->node);
+ lttng_ht_add_ulong(uchan->ctx, &uctx->node);
rcu_read_unlock();
cds_list_add_tail(&uctx->list, &uchan->ctx_list);
error:
free(uctx);
+duplicate:
return ret;
}
{
int ret;
struct ltt_kernel_channel *kchan;
- struct lttng_kernel_context kctx;
+ struct ltt_kernel_context *kctx;
assert(ksession);
assert(ctx);
assert(channel_name);
+ kctx = trace_kernel_create_context(NULL);
+ if (!kctx) {
+ ret = LTTNG_ERR_NOMEM;
+ goto error;
+ }
+
/* Setup kernel context structure */
switch (ctx->ctx) {
case LTTNG_EVENT_CONTEXT_PID:
- kctx.ctx = LTTNG_KERNEL_CONTEXT_PID;
- break;
- case LTTNG_EVENT_CONTEXT_PERF_COUNTER:
- kctx.ctx = LTTNG_KERNEL_CONTEXT_PERF_COUNTER;
+ kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PID;
break;
case LTTNG_EVENT_CONTEXT_PROCNAME:
- kctx.ctx = LTTNG_KERNEL_CONTEXT_PROCNAME;
+ kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PROCNAME;
break;
case LTTNG_EVENT_CONTEXT_PRIO:
- kctx.ctx = LTTNG_KERNEL_CONTEXT_PRIO;
+ kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PRIO;
break;
case LTTNG_EVENT_CONTEXT_NICE:
- kctx.ctx = LTTNG_KERNEL_CONTEXT_NICE;
+ kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_NICE;
break;
case LTTNG_EVENT_CONTEXT_VPID:
- kctx.ctx = LTTNG_KERNEL_CONTEXT_VPID;
+ kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VPID;
break;
case LTTNG_EVENT_CONTEXT_TID:
- kctx.ctx = LTTNG_KERNEL_CONTEXT_TID;
+ kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_TID;
break;
case LTTNG_EVENT_CONTEXT_VTID:
- kctx.ctx = LTTNG_KERNEL_CONTEXT_VTID;
+ kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VTID;
break;
case LTTNG_EVENT_CONTEXT_PPID:
- kctx.ctx = LTTNG_KERNEL_CONTEXT_PPID;
+ kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PPID;
break;
case LTTNG_EVENT_CONTEXT_VPPID:
- kctx.ctx = LTTNG_KERNEL_CONTEXT_VPPID;
+ kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VPPID;
break;
case LTTNG_EVENT_CONTEXT_HOSTNAME:
- kctx.ctx = LTTNG_KERNEL_CONTEXT_HOSTNAME;
+ kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_HOSTNAME;
+ break;
+ case LTTNG_EVENT_CONTEXT_PERF_CPU_COUNTER:
+ case LTTNG_EVENT_CONTEXT_PERF_COUNTER:
+ 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.u.perf_counter.type = ctx->u.perf_counter.type;
- kctx.u.perf_counter.config = ctx->u.perf_counter.config;
- strncpy(kctx.u.perf_counter.name, ctx->u.perf_counter.name,
+ kctx->ctx.u.perf_counter.type = ctx->u.perf_counter.type;
+ kctx->ctx.u.perf_counter.config = ctx->u.perf_counter.config;
+ strncpy(kctx->ctx.u.perf_counter.name, ctx->u.perf_counter.name,
LTTNG_SYMBOL_NAME_LEN);
- kctx.u.perf_counter.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
+ kctx->ctx.u.perf_counter.name[LTTNG_SYMBOL_NAME_LEN - 1] = '\0';
if (*channel_name == '\0') {
- ret = add_kctx_all_channels(ksession, &kctx);
+ ret = add_kctx_all_channels(ksession, kctx);
if (ret != LTTNG_OK) {
goto error;
}
goto error;
}
- ret = add_kctx_to_channel(&kctx, kchan);
+ ret = add_kctx_to_channel(kctx, kchan);
if (ret != LTTNG_OK) {
goto error;
}
}
- 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;
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') {
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;
}
}
projects / lttng-tools.git / blobdiff