X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-context.c;h=54fa447848177770d47e309d6eb52e60477cabb5;hb=ceabb767180e064629b5a9ab4ed14449da864763;hp=bed3d1c24602fde4207c4764d1cf8d6bff168121;hpb=3834b99f4341209754c4955ec853dc250b33ed4b;p=lttng-modules.git

diff --git a/lttng-context.c b/lttng-context.c
index bed3d1c2..54fa4478 100644
--- a/lttng-context.c
+++ b/lttng-context.c
@@ -1,23 +1,10 @@
-/*
+/* SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
+ *
  * lttng-context.c
  *
  * LTTng trace/channel/event context management.
  *
  * Copyright (C) 2011-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <linux/module.h>
@@ -125,95 +112,65 @@ void lttng_context_update(struct lttng_ctx *ctx)
 		type = &ctx->fields[i].event_field.type;
 		switch (type->atype) {
 		case atype_integer:
-			field_align = type->u.basic.integer.alignment;
+			field_align = type->u.integer.alignment;
 			break;
-		case atype_array:
-		case atype_array_bitfield:
+		case atype_array_nestable:
 		{
-			struct lttng_basic_type *btype;
+			const struct lttng_type *nested_type;
 
-			btype = &type->u.array.elem_type;
-			switch (btype->atype) {
+			nested_type = type->u.array_nestable.elem_type;
+			switch (nested_type->atype) {
 			case atype_integer:
-				field_align = btype->u.basic.integer.alignment;
+				field_align = nested_type->u.integer.alignment;
 				break;
 			case atype_string:
 				break;
 
-			case atype_array:
-			case atype_sequence:
-			case atype_array_bitfield:
-			case atype_sequence_bitfield:
-			case atype_struct:
-			case atype_array_compound:
-			case atype_sequence_compound:
-			case atype_variant:
+			case atype_array_nestable:
+			case atype_sequence_nestable:
+			case atype_struct_nestable:
+			case atype_variant_nestable:
 			default:
 				WARN_ON_ONCE(1);
 				break;
 			}
+			field_align = max_t(size_t, field_align,
+					type->u.array_nestable.alignment);
 			break;
 		}
-		case atype_sequence:
-		case atype_sequence_bitfield:
+		case atype_sequence_nestable:
 		{
-			struct lttng_basic_type *btype;
-
-			btype = &type->u.sequence.length_type;
-			switch (btype->atype) {
-			case atype_integer:
-				field_align = btype->u.basic.integer.alignment;
-				break;
-
-			case atype_string:
-			case atype_array:
-			case atype_sequence:
-			case atype_array_bitfield:
-			case atype_sequence_bitfield:
-			case atype_struct:
-			case atype_array_compound:
-			case atype_sequence_compound:
-			case atype_variant:
-			default:
-				WARN_ON_ONCE(1);
-				break;
-			}
+			const struct lttng_type *nested_type;
 
-			btype = &type->u.sequence.elem_type;
-			switch (btype->atype) {
+			nested_type = type->u.sequence_nestable.elem_type;
+			switch (nested_type->atype) {
 			case atype_integer:
-				field_align = max_t(size_t,
-					field_align,
-					btype->u.basic.integer.alignment);
+				field_align = nested_type->u.integer.alignment;
 				break;
 
 			case atype_string:
 				break;
 
-			case atype_array:
-			case atype_sequence:
-			case atype_array_bitfield:
-			case atype_sequence_bitfield:
-			case atype_struct:
-			case atype_array_compound:
-			case atype_sequence_compound:
-			case atype_variant:
+			case atype_array_nestable:
+			case atype_sequence_nestable:
+			case atype_struct_nestable:
+			case atype_variant_nestable:
 			default:
 				WARN_ON_ONCE(1);
 				break;
 			}
+			field_align = max_t(size_t, field_align,
+					type->u.sequence_nestable.alignment);
 			break;
 		}
 		case atype_string:
 			break;
 
-		case atype_struct:
-		case atype_array_compound:
-		case atype_sequence_compound:
-		case atype_variant:
+		case atype_struct_nestable:
+		case atype_variant_nestable:
 			break;
 
-		case atype_enum:
+		case atype_enum_nestable:
 		default:
 			WARN_ON_ONCE(1);
 			break;
@@ -316,6 +273,34 @@ int lttng_context_init(void)
 	if (ret && ret != -ENOSYS) {
 		printk(KERN_WARNING "Cannot add context lttng_add_migratable_to_ctx");
 	}
+	ret = lttng_add_cgroup_ns_to_ctx(&lttng_static_ctx);
+	if (ret && ret != -ENOSYS) {
+		printk(KERN_WARNING "Cannot add context lttng_add_cgroup_ns_to_ctx");
+	}
+	ret = lttng_add_ipc_ns_to_ctx(&lttng_static_ctx);
+	if (ret && ret != -ENOSYS) {
+		printk(KERN_WARNING "Cannot add context lttng_add_ipc_ns_to_ctx");
+	}
+	ret = lttng_add_mnt_ns_to_ctx(&lttng_static_ctx);
+	if (ret && ret != -ENOSYS) {
+		printk(KERN_WARNING "Cannot add context lttng_add_mnt_ns_to_ctx");
+	}
+	ret = lttng_add_net_ns_to_ctx(&lttng_static_ctx);
+	if (ret && ret != -ENOSYS) {
+		printk(KERN_WARNING "Cannot add context lttng_add_net_ns_to_ctx");
+	}
+	ret = lttng_add_pid_ns_to_ctx(&lttng_static_ctx);
+	if (ret && ret != -ENOSYS) {
+		printk(KERN_WARNING "Cannot add context lttng_add_pid_ns_to_ctx");
+	}
+	ret = lttng_add_user_ns_to_ctx(&lttng_static_ctx);
+	if (ret && ret != -ENOSYS) {
+		printk(KERN_WARNING "Cannot add context lttng_add_user_ns_to_ctx");
+	}
+	ret = lttng_add_uts_ns_to_ctx(&lttng_static_ctx);
+	if (ret && ret != -ENOSYS) {
+		printk(KERN_WARNING "Cannot add context lttng_add_uts_ns_to_ctx");
+	}
 	/* TODO: perf counters for filtering */
 	return 0;
 }