X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcontext.c;h=af1c32dea90b6f64078b08c36fcffa65d21441be;hp=7fc455438fab9cc856b6b37204997a16bccf7919;hb=26c9d55e1367d3aff6e501b5a1295edd1ccbc210;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377 diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c index 7fc455438..af1c32dea 100644 --- a/src/bin/lttng-sessiond/context.c +++ b/src/bin/lttng-sessiond/context.c @@ -1,18 +1,18 @@ /* * Copyright (C) 2011 - David Goulet * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; only version 2 of the License. + * 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, + * as published by the Free Software Foundation. * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307, USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #define _GNU_SOURCE @@ -22,8 +22,8 @@ #include #include +#include #include -#include #include "context.h" #include "kernel.h" @@ -158,11 +158,13 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess, int domain, { int ret; struct ltt_ust_context *uctx; + struct lttng_ht_iter iter; + struct lttng_ht_node_ulong *uctx_node; /* Create ltt UST context */ uctx = trace_ust_create_context(ctx); if (uctx == NULL) { - ret = LTTCOMM_FATAL; + ret = -EINVAL; goto error; } @@ -174,14 +176,24 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess, int domain, } break; default: - ret = LTTCOMM_NOT_IMPLEMENTED; + ret = -ENOSYS; + 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; goto error; } /* Add ltt UST context node to ltt UST channel */ lttng_ht_add_unique_ulong(uchan->ctx, &uctx->node); - return LTTCOMM_OK; + DBG("Context UST %d added to channel %s", uctx->ctx.ctx, uchan->name); + + return 0; error: free(uctx); @@ -197,11 +209,14 @@ static int add_uctx_to_event(struct ltt_ust_session *usess, int domain, { int ret; struct ltt_ust_context *uctx; + struct lttng_ht_iter iter; + struct lttng_ht_node_ulong *uctx_node; /* Create ltt UST context */ uctx = trace_ust_create_context(ctx); if (uctx == NULL) { - ret = LTTCOMM_FATAL; + /* Context values are invalid. */ + ret = -EINVAL; goto error; } @@ -213,14 +228,24 @@ static int add_uctx_to_event(struct ltt_ust_session *usess, int domain, } break; default: - ret = LTTCOMM_NOT_IMPLEMENTED; + ret = -ENOSYS; + goto error; + } + + /* Lookup context before adding it */ + lttng_ht_lookup(uevent->ctx, (void *)((unsigned long)uctx->ctx.ctx), &iter); + uctx_node = lttng_ht_iter_get_node_ulong(&iter); + if (uctx_node != NULL) { + ret = -EEXIST; goto error; } /* Add ltt UST context node to ltt UST event */ lttng_ht_add_unique_ulong(uevent->ctx, &uctx->node); - return LTTCOMM_OK; + DBG("Context UST %d added to event %s", uctx->ctx.ctx, uevent->attr.name); + + return 0; error: free(uctx); @@ -239,7 +264,41 @@ int context_kernel_add(struct ltt_kernel_session *ksession, struct lttng_kernel_context kctx; /* Setup kernel context structure */ - kctx.ctx = ctx->ctx; + 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; + break; + case LTTNG_EVENT_CONTEXT_PROCNAME: + kctx.ctx = LTTNG_KERNEL_CONTEXT_PROCNAME; + break; + case LTTNG_EVENT_CONTEXT_PRIO: + kctx.ctx = LTTNG_KERNEL_CONTEXT_PRIO; + break; + case LTTNG_EVENT_CONTEXT_NICE: + kctx.ctx = LTTNG_KERNEL_CONTEXT_NICE; + break; + case LTTNG_EVENT_CONTEXT_VPID: + kctx.ctx = LTTNG_KERNEL_CONTEXT_VPID; + break; + case LTTNG_EVENT_CONTEXT_TID: + kctx.ctx = LTTNG_KERNEL_CONTEXT_TID; + break; + case LTTNG_EVENT_CONTEXT_VTID: + kctx.ctx = LTTNG_KERNEL_CONTEXT_VTID; + break; + case LTTNG_EVENT_CONTEXT_PPID: + kctx.ctx = LTTNG_KERNEL_CONTEXT_PPID; + break; + case LTTNG_EVENT_CONTEXT_VPPID: + kctx.ctx = LTTNG_KERNEL_CONTEXT_VPPID; + break; + default: + return LTTCOMM_KERN_CONTEXT_FAIL; + } + 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, @@ -279,7 +338,7 @@ int context_ust_add(struct ltt_ust_session *usess, int domain, char *channel_name) { int ret = LTTCOMM_OK, have_event = 0; - struct lttng_ht_iter iter, uiter; + struct lttng_ht_iter iter; struct lttng_ht *chan_ht; struct ltt_ust_channel *uchan = NULL; struct ltt_ust_event *uevent = NULL; @@ -292,11 +351,13 @@ int context_ust_add(struct ltt_ust_session *usess, int 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 = LTTCOMM_NOT_IMPLEMENTED; + ret = LTTCOMM_UND; goto error; } @@ -350,20 +411,9 @@ 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 added to channel %s failed", uchan->name); + ERR("Context failed for channel %s", uchan->name); continue; } - - /* For all events in channel */ - cds_lfht_for_each_entry(uchan->events->ht, &uiter.iter, uevent, - node.node) { - ret = add_uctx_to_event(usess, domain, uchan, uevent, ctx); - if (ret < 0) { - ERR("Context add to event %s in channel %s failed", - uevent->attr.name, uchan->name); - continue; - } - } } } @@ -371,14 +421,21 @@ end: switch (ret) { case -EEXIST: ret = LTTCOMM_UST_CONTEXT_EXIST; - goto error; + break; case -ENOMEM: ret = LTTCOMM_FATAL; - goto error; + break; + case -EINVAL: + ret = LTTCOMM_UST_CONTEXT_INVAL; + break; + case -ENOSYS: + ret = LTTCOMM_UNKNOWN_DOMAIN; + break; + default: + ret = LTTCOMM_OK; + break; } - return LTTCOMM_OK; - error: return ret; }