/*
* Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
*
- * 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
{
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;
}
}
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);
{
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;
}
}
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);
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,
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;
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
- ret = LTTCOMM_NOT_IMPLEMENTED;
+ ret = LTTCOMM_UND;
goto error;
}
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;
- }
- }
}
}
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;
}
projects / lttng-tools.git / blobdiff