X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-context.c;h=5637028bed1bdd35d38715ad68afc33673652c50;hb=15b385c8a645128e3ed89f7f840c1441223097a4;hp=ad6c38f0241486f78392cb82f5348a15d83187a6;hpb=735bef4705cc42f25d26f25be09ba98f1efb8511;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context.c b/liblttng-ust/lttng-context.c
index ad6c38f0..5637028b 100644
--- a/liblttng-ust/lttng-context.c
+++ b/liblttng-ust/lttng-context.c
@@ -27,6 +27,7 @@
 #include <urcu-pointer.h>
 #include <usterr-signal-safe.h>
 #include <helper.h>
+#include <stddef.h>
 #include <string.h>
 #include <assert.h>
 
@@ -179,13 +180,13 @@ 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:
 		{
 			struct lttng_basic_type *btype;
 
-			btype = &type->u.array.elem_type;
+			btype = &type->u.legacy.array.elem_type;
 			switch (btype->atype) {
 			case atype_integer:
 				field_align = btype->u.basic.integer.alignment;
@@ -194,18 +195,44 @@ void lttng_context_update(struct lttng_ctx *ctx)
 				break;
 
 			case atype_array:
+			case atype_array_nestable:
 			case atype_sequence:
+			case atype_sequence_nestable:
 			default:
 				WARN_ON_ONCE(1);
 				break;
 			}
 			break;
 		}
+		case atype_array_nestable:
+		{
+			const struct lttng_type *nested_type;
+
+			nested_type = type->u.array_nestable.elem_type;
+			switch (nested_type->atype) {
+			case atype_integer:
+				field_align = nested_type->u.integer.alignment;
+				break;
+			case atype_string:
+				break;
+
+			case atype_array:
+			case atype_array_nestable:
+			case atype_sequence:
+			case atype_sequence_nestable:
+			default:
+				WARN_ON_ONCE(1);
+				break;
+			}
+			field_align = max_t(size_t, field_align,
+					type->u.array_nestable.alignment);
+			break;
+		}
 		case atype_sequence:
 		{
 			struct lttng_basic_type *btype;
 
-			btype = &type->u.sequence.length_type;
+			btype = &type->u.legacy.sequence.length_type;
 			switch (btype->atype) {
 			case atype_integer:
 				field_align = btype->u.basic.integer.alignment;
@@ -213,13 +240,15 @@ void lttng_context_update(struct lttng_ctx *ctx)
 
 			case atype_string:
 			case atype_array:
+			case atype_array_nestable:
 			case atype_sequence:
+			case atype_sequence_nestable:
 			default:
 				WARN_ON_ONCE(1);
 				break;
 			}
 
-			btype = &type->u.sequence.elem_type;
+			btype = &type->u.legacy.sequence.elem_type;
 			switch (btype->atype) {
 			case atype_integer:
 				field_align = max_t(size_t,
@@ -231,18 +260,46 @@ void lttng_context_update(struct lttng_ctx *ctx)
 				break;
 
 			case atype_array:
+			case atype_array_nestable:
 			case atype_sequence:
+			case atype_sequence_nestable:
 			default:
 				WARN_ON_ONCE(1);
 				break;
 			}
 			break;
 		}
+		case atype_sequence_nestable:
+		{
+			const struct lttng_type *nested_type;
+
+			nested_type = type->u.sequence_nestable.elem_type;
+			switch (nested_type->atype) {
+			case atype_integer:
+				field_align = nested_type->u.integer.alignment;
+				break;
+
+			case atype_string:
+				break;
+
+			case atype_array:
+			case atype_array_nestable:
+			case atype_sequence:
+			case atype_sequence_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_dynamic:
 			break;
 		case atype_enum:
+		case atype_enum_nestable:
 		default:
 			WARN_ON_ONCE(1);
 			break;
@@ -407,6 +464,36 @@ int lttng_session_context_init(struct lttng_ctx **ctx)
 		WARN("Cannot add context lttng_add_uts_ns_to_ctx");
 		goto error;
 	}
+	ret = lttng_add_vuid_to_ctx(ctx);
+	if (ret) {
+		WARN("Cannot add context lttng_add_vuid_to_ctx");
+		goto error;
+	}
+	ret = lttng_add_veuid_to_ctx(ctx);
+	if (ret) {
+		WARN("Cannot add context lttng_add_veuid_to_ctx");
+		goto error;
+	}
+	ret = lttng_add_vsuid_to_ctx(ctx);
+	if (ret) {
+		WARN("Cannot add context lttng_add_vsuid_to_ctx");
+		goto error;
+	}
+	ret = lttng_add_vgid_to_ctx(ctx);
+	if (ret) {
+		WARN("Cannot add context lttng_add_vgid_to_ctx");
+		goto error;
+	}
+	ret = lttng_add_vegid_to_ctx(ctx);
+	if (ret) {
+		WARN("Cannot add context lttng_add_vegid_to_ctx");
+		goto error;
+	}
+	ret = lttng_add_vsgid_to_ctx(ctx);
+	if (ret) {
+		WARN("Cannot add context lttng_add_vsgid_to_ctx");
+		goto error;
+	}
 	lttng_context_update(*ctx);
 	return 0;