X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcontext.c;h=621c0b9fb53cfa88a56abc5b6737b52aee8eaa56;hp=6cf301dcd04488b1a9f02ce79584e5cf0c445dea;hb=d37ac3cdc4fe21f117edfb829db4d0eb7cf914a1;hpb=373148e9cedd5ec0b2302f4afe3ecd543e405f4f

diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c
index 6cf301dcd..621c0b9fb 100644
--- a/src/bin/lttng-sessiond/context.c
+++ b/src/bin/lttng-sessiond/context.c
@@ -1,19 +1,9 @@
 /*
- * 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
@@ -107,7 +97,8 @@ error:
  */
 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;
@@ -169,18 +160,19 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess,
 		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;
@@ -195,7 +187,7 @@ duplicate:
  * 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;
@@ -265,6 +257,66 @@ int context_kernel_add(struct ltt_kernel_session *ksession,
 	case LTTNG_EVENT_CONTEXT_CALLSTACK_USER:
 		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_CALLSTACK_USER;
 		break;
+	case LTTNG_EVENT_CONTEXT_CGROUP_NS:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_CGROUP_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_IPC_NS:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_IPC_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_MNT_NS:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_MNT_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_NET_NS:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_NET_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_PID_NS:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PID_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_TIME_NS:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_TIME_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_USER_NS:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_USER_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_UTS_NS:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_UTS_NS;
+		break;
+	case LTTNG_EVENT_CONTEXT_UID:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_UID;
+		break;
+	case LTTNG_EVENT_CONTEXT_EUID:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_EUID;
+		break;
+	case LTTNG_EVENT_CONTEXT_SUID:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_SUID;
+		break;
+	case LTTNG_EVENT_CONTEXT_GID:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_GID;
+		break;
+	case LTTNG_EVENT_CONTEXT_EGID:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_EGID;
+		break;
+	case LTTNG_EVENT_CONTEXT_SGID:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_SGID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VUID:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VUID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VEUID:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VEUID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VSUID:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VSUID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VGID:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VGID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VEGID:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VEGID;
+		break;
+	case LTTNG_EVENT_CONTEXT_VSGID:
+		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_VSGID;
+		break;
 	default:
 		ret = LTTNG_ERR_KERN_CONTEXT_FAIL;
 		goto error;
@@ -312,7 +364,8 @@ error:
  * 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;