/*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- * Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * 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,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
*
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#define _LGPL_SOURCE
int ret;
struct ltt_kernel_channel *kchan;
- assert(ksession);
- assert(kctx);
+ LTTNG_ASSERT(ksession);
+ LTTNG_ASSERT(kctx);
DBG("Adding kernel context to all channels");
{
int ret;
- assert(kchan);
- assert(kctx);
+ LTTNG_ASSERT(kchan);
+ LTTNG_ASSERT(kctx);
DBG("Add kernel context to channel '%s'", kchan->channel->name);
*/
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)
+ struct ltt_ust_channel *uchan,
+ const struct lttng_event_context *ctx)
{
int ret;
struct ltt_ust_context *uctx = NULL;
- assert(usess);
- assert(uchan);
- assert(ctx);
+ LTTNG_ASSERT(usess);
+ LTTNG_ASSERT(uchan);
+ LTTNG_ASSERT(ctx);
/* Check if context is duplicate */
cds_list_for_each_entry(uctx, &uchan->ctx_list, list) {
case LTTNG_DOMAIN_UST:
break;
default:
- assert(0);
+ abort();
}
/* Create ltt UST context */
goto error;
}
- 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_ulong(uchan->ctx, &uctx->node);
- rcu_read_unlock();
cds_list_add_tail(&uctx->list, &uchan->ctx_list);
+ if (!usess->active) {
+ goto end;
+ }
+
+ ret = ust_app_add_ctx_channel_glb(usess, uchan, uctx);
+ if (ret < 0) {
+ goto error;
+ }
+end:
DBG("Context UST %d added to channel %s", uctx->ctx.ctx, uchan->name);
return 0;
* Add kernel context to tracer.
*/
int context_kernel_add(struct ltt_kernel_session *ksession,
- struct lttng_event_context *ctx, char *channel_name)
+ const struct lttng_event_context *ctx, char *channel_name)
{
int ret;
struct ltt_kernel_channel *kchan;
struct ltt_kernel_context *kctx;
- assert(ksession);
- assert(ctx);
- assert(channel_name);
+ LTTNG_ASSERT(ksession);
+ LTTNG_ASSERT(ctx);
+ LTTNG_ASSERT(channel_name);
kctx = trace_kernel_create_context(NULL);
if (!kctx) {
/* Setup kernel context structure */
switch (ctx->ctx) {
case LTTNG_EVENT_CONTEXT_PID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PID;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_PID;
break;
case LTTNG_EVENT_CONTEXT_PROCNAME:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PROCNAME;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_PROCNAME;
break;
case LTTNG_EVENT_CONTEXT_PRIO:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PRIO;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_PRIO;
break;
case LTTNG_EVENT_CONTEXT_NICE:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_NICE;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_NICE;
break;
case LTTNG_EVENT_CONTEXT_VPID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VPID;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_VPID;
break;
case LTTNG_EVENT_CONTEXT_TID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_TID;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_TID;
break;
case LTTNG_EVENT_CONTEXT_VTID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VTID;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_VTID;
break;
case LTTNG_EVENT_CONTEXT_PPID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PPID;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_PPID;
break;
case LTTNG_EVENT_CONTEXT_VPPID:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VPPID;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_VPPID;
break;
case LTTNG_EVENT_CONTEXT_HOSTNAME:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_HOSTNAME;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_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;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_PERF_CPU_COUNTER;
break;
case LTTNG_EVENT_CONTEXT_INTERRUPTIBLE:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_INTERRUPTIBLE;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_INTERRUPTIBLE;
break;
case LTTNG_EVENT_CONTEXT_PREEMPTIBLE:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PREEMPTIBLE;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_PREEMPTIBLE;
break;
case LTTNG_EVENT_CONTEXT_NEED_RESCHEDULE:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_NEED_RESCHEDULE;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_NEED_RESCHEDULE;
break;
case LTTNG_EVENT_CONTEXT_MIGRATABLE:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_MIGRATABLE;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_MIGRATABLE;
break;
case LTTNG_EVENT_CONTEXT_CALLSTACK_KERNEL:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_CALLSTACK_KERNEL;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_CALLSTACK_KERNEL;
break;
case LTTNG_EVENT_CONTEXT_CALLSTACK_USER:
- kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_CALLSTACK_USER;
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_CALLSTACK_USER;
+ break;
+ case LTTNG_EVENT_CONTEXT_CGROUP_NS:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_CGROUP_NS;
+ break;
+ case LTTNG_EVENT_CONTEXT_IPC_NS:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_IPC_NS;
+ break;
+ case LTTNG_EVENT_CONTEXT_MNT_NS:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_MNT_NS;
+ break;
+ case LTTNG_EVENT_CONTEXT_NET_NS:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_NET_NS;
+ break;
+ case LTTNG_EVENT_CONTEXT_PID_NS:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_PID_NS;
+ break;
+ case LTTNG_EVENT_CONTEXT_TIME_NS:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_TIME_NS;
+ break;
+ case LTTNG_EVENT_CONTEXT_USER_NS:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_USER_NS;
+ break;
+ case LTTNG_EVENT_CONTEXT_UTS_NS:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_UTS_NS;
+ break;
+ case LTTNG_EVENT_CONTEXT_UID:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_UID;
+ break;
+ case LTTNG_EVENT_CONTEXT_EUID:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_EUID;
+ break;
+ case LTTNG_EVENT_CONTEXT_SUID:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_SUID;
+ break;
+ case LTTNG_EVENT_CONTEXT_GID:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_GID;
+ break;
+ case LTTNG_EVENT_CONTEXT_EGID:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_EGID;
+ break;
+ case LTTNG_EVENT_CONTEXT_SGID:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_SGID;
+ break;
+ case LTTNG_EVENT_CONTEXT_VUID:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_VUID;
+ break;
+ case LTTNG_EVENT_CONTEXT_VEUID:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_VEUID;
+ break;
+ case LTTNG_EVENT_CONTEXT_VSUID:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_VSUID;
+ break;
+ case LTTNG_EVENT_CONTEXT_VGID:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_VGID;
+ break;
+ case LTTNG_EVENT_CONTEXT_VEGID:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_VEGID;
+ break;
+ case LTTNG_EVENT_CONTEXT_VSGID:
+ kctx->ctx.ctx = LTTNG_KERNEL_ABI_CONTEXT_VSGID;
break;
default:
ret = LTTNG_ERR_KERN_CONTEXT_FAIL;
* Add UST context to tracer.
*/
int context_ust_add(struct ltt_ust_session *usess,
- enum lttng_domain_type domain, struct lttng_event_context *ctx,
+ enum lttng_domain_type domain,
+ const struct lttng_event_context *ctx,
char *channel_name)
{
int ret = LTTNG_OK;
struct lttng_ht *chan_ht;
struct ltt_ust_channel *uchan = NULL;
- assert(usess);
- assert(ctx);
- assert(channel_name);
+ LTTNG_ASSERT(usess);
+ LTTNG_ASSERT(ctx);
+ LTTNG_ASSERT(channel_name);
rcu_read_lock();