X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-filter-interpreter.c;h=5ba7e230094458fd864bc7500ce60bf6988dc391;hb=4f47ccf08dfac3d5db7553eb8b40bdab19764727;hp=bf69549707657ed89fd524f35b74ecb0fc7dcea7;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git

diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c
index bf695497..5ba7e230 100644
--- a/lttng-filter-interpreter.c
+++ b/lttng-filter-interpreter.c
@@ -7,13 +7,13 @@
  * Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <linux/uaccess.h>
+#include <wrapper/uaccess.h>
 #include <wrapper/frame.h>
 #include <wrapper/types.h>
 #include <linux/swab.h>
 
-#include <lttng-filter.h>
-#include <lttng-string-utils.h>
+#include <lttng/filter.h>
+#include <lttng/string-utils.h>
 
 LTTNG_STACK_FRAME_NON_STANDARD(lttng_filter_interpret_bytecode);
 
@@ -30,7 +30,7 @@ char get_char(struct estack_entry *reg, size_t offset)
 		char c;
 
 		/* Handle invalid access as end of string. */
-		if (unlikely(!access_ok(VERIFY_READ,
+		if (unlikely(!lttng_access_ok(VERIFY_READ,
 				reg->u.s.user_str + offset,
 				sizeof(c))))
 			return '\0';
@@ -288,7 +288,7 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
 	switch (field->type.atype) {
 	case atype_integer:
 		ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
-		if (field->type.u.basic.integer.signedness) {
+		if (field->type.u.integer.signedness) {
 			ptr->object_type = OBJECT_TYPE_S64;
 			ptr->u.s64 = v.s64;
 			ptr->ptr = &ptr->u.s64;
@@ -298,10 +298,10 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
 			ptr->ptr = &ptr->u.u64;
 		}
 		break;
-	case atype_enum:
+	case atype_enum_nestable:
 	{
 		const struct lttng_integer_type *itype =
-			&field->type.u.basic.enumeration.container_type;
+			&field->type.u.enum_nestable.container_type->u.integer;
 
 		ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
 		if (itype->signedness) {
@@ -315,12 +315,12 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
 		}
 		break;
 	}
-	case atype_array:
-		if (field->type.u.array.elem_type.atype != atype_integer) {
+	case atype_array_nestable:
+		if (!lttng_is_bytewise_integer(field->type.u.array_nestable.elem_type)) {
 			printk(KERN_WARNING "Array nesting only supports integer types.\n");
 			return -EINVAL;
 		}
-		if (field->type.u.array.elem_type.u.basic.integer.encoding == lttng_encode_none) {
+		if (field->type.u.array_nestable.elem_type->u.integer.encoding == lttng_encode_none) {
 			printk(KERN_WARNING "Only string arrays are supported for contexts.\n");
 			return -EINVAL;
 		}
@@ -328,12 +328,12 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
 		ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
 		ptr->ptr = v.str;
 		break;
-	case atype_sequence:
-		if (field->type.u.sequence.elem_type.atype != atype_integer) {
+	case atype_sequence_nestable:
+		if (!lttng_is_bytewise_integer(field->type.u.sequence_nestable.elem_type)) {
 			printk(KERN_WARNING "Sequence nesting only supports integer types.\n");
 			return -EINVAL;
 		}
-		if (field->type.u.sequence.elem_type.u.basic.integer.encoding == lttng_encode_none) {
+		if (field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_encode_none) {
 			printk(KERN_WARNING "Only string sequences are supported for contexts.\n");
 			return -EINVAL;
 		}
@@ -341,20 +341,17 @@ static int context_get_index(struct lttng_probe_ctx *lttng_probe_ctx,
 		ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
 		ptr->ptr = v.str;
 		break;
-	case atype_array_bitfield:
-		printk(KERN_WARNING "Bitfield array type is not supported.\n");
-		return -EINVAL;
-	case atype_sequence_bitfield:
-		printk(KERN_WARNING "Bitfield sequence type is not supported.\n");
-		return -EINVAL;
 	case atype_string:
 		ptr->object_type = OBJECT_TYPE_STRING;
 		ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
 		ptr->ptr = v.str;
 		break;
-	case atype_struct:
+	case atype_struct_nestable:
 		printk(KERN_WARNING "Structure type cannot be loaded.\n");
 		return -EINVAL;
+	case atype_variant_nestable:
+		printk(KERN_WARNING "Variant type cannot be loaded.\n");
+		return -EINVAL;
 	default:
 		printk(KERN_WARNING "Unknown type: %d", (int) field->type.atype);
 		return -EINVAL;