X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-specialize.c;h=d4f8a957f51ff191f348121008a8cc3c9800ceb5;hb=92495593f8a331d04f993e396de9f2caa748fb6f;hp=39730f8cd954a0428ff419fe1d9114a70caf7a33;hpb=fb31eb73d8a4a6d9784ed5c335b7fa3b9684108c;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter-specialize.c b/liblttng-ust/lttng-filter-specialize.c
index 39730f8c..d4f8a957 100644
--- a/liblttng-ust/lttng-filter-specialize.c
+++ b/liblttng-ust/lttng-filter-specialize.c
@@ -30,6 +30,7 @@
 
 #include "lttng-filter.h"
 #include <lttng/align.h>
+#include "ust-events-internal.h"
 
 static int lttng_fls(int val)
 {
@@ -74,7 +75,7 @@ static ssize_t bytecode_reserve_data(struct bytecode_runtime *runtime,
 		size_t align, size_t len)
 {
 	ssize_t ret;
-	size_t padding = offset_align(runtime->data_len, align);
+	size_t padding = lttng_ust_offset_align(runtime->data_len, align);
 	size_t new_len = runtime->data_len + padding + len;
 	size_t new_alloc_len = new_len;
 	size_t old_alloc_len = runtime->data_alloc_len;
@@ -259,14 +260,31 @@ static int specialize_get_index(struct bytecode_runtime *runtime,
 		switch (stack_top->load.object_type) {
 		case OBJECT_TYPE_ARRAY:
 		{
+			const struct lttng_integer_type *integer_type;
 			const struct lttng_event_field *field;
 			uint32_t elem_len, num_elems;
 			int signedness;
 
 			field = stack_top->load.field;
-			elem_len = field->type.u.array.elem_type.u.basic.integer.size;
-			signedness = field->type.u.array.elem_type.u.basic.integer.signedness;
-			num_elems = field->type.u.array.length;
+			switch (field->type.atype) {
+			case atype_array:
+				integer_type = &field->type.u.legacy.array.elem_type.u.basic.integer;
+				num_elems = field->type.u.legacy.array.length;
+				break;
+			case atype_array_nestable:
+				if (field->type.u.array_nestable.elem_type->atype != atype_integer) {
+					ret = -EINVAL;
+					goto end;
+				}
+				integer_type = &field->type.u.array_nestable.elem_type->u.integer;
+				num_elems = field->type.u.array_nestable.length;
+				break;
+			default:
+				ret = -EINVAL;
+				goto end;
+			}
+			elem_len = integer_type->size;
+			signedness = integer_type->signedness;
 			if (index >= num_elems) {
 				ret = -EINVAL;
 				goto end;
@@ -279,20 +297,36 @@ static int specialize_get_index(struct bytecode_runtime *runtime,
 			gid.array_len = num_elems * (elem_len / CHAR_BIT);
 			gid.elem.type = stack_top->load.object_type;
 			gid.elem.len = elem_len;
-			if (field->type.u.array.elem_type.u.basic.integer.reverse_byte_order)
+			if (integer_type->reverse_byte_order)
 				gid.elem.rev_bo = true;
 			stack_top->load.rev_bo = gid.elem.rev_bo;
 			break;
 		}
 		case OBJECT_TYPE_SEQUENCE:
 		{
+			const struct lttng_integer_type *integer_type;
 			const struct lttng_event_field *field;
 			uint32_t elem_len;
 			int signedness;
 
 			field = stack_top->load.field;
-			elem_len = field->type.u.sequence.elem_type.u.basic.integer.size;
-			signedness = field->type.u.sequence.elem_type.u.basic.integer.signedness;
+			switch (field->type.atype) {
+			case atype_sequence:
+				integer_type = &field->type.u.legacy.sequence.elem_type.u.basic.integer;
+				break;
+			case atype_sequence_nestable:
+				if (field->type.u.sequence_nestable.elem_type->atype != atype_integer) {
+					ret = -EINVAL;
+					goto end;
+				}
+				integer_type = &field->type.u.sequence_nestable.elem_type->u.integer;
+				break;
+			default:
+				ret = -EINVAL;
+				goto end;
+			}
+			elem_len = integer_type->size;
+			signedness = integer_type->signedness;
 			ret = specialize_get_index_object_type(&stack_top->load.object_type,
 					signedness, elem_len);
 			if (ret)
@@ -300,7 +334,7 @@ static int specialize_get_index(struct bytecode_runtime *runtime,
 			gid.offset = index * (elem_len / CHAR_BIT);
 			gid.elem.type = stack_top->load.object_type;
 			gid.elem.len = elem_len;
-			if (field->type.u.sequence.elem_type.u.basic.integer.reverse_byte_order)
+			if (integer_type->reverse_byte_order)
 				gid.elem.rev_bo = true;
 			stack_top->load.rev_bo = gid.elem.rev_bo;
 			break;
@@ -367,17 +401,22 @@ static int specialize_load_object(const struct lttng_event_field *field,
 	 */
 	switch (field->type.atype) {
 	case atype_integer:
-		if (field->type.u.basic.integer.signedness)
+		if (field->type.u.integer.signedness)
 			load->object_type = OBJECT_TYPE_S64;
 		else
 			load->object_type = OBJECT_TYPE_U64;
 		load->rev_bo = false;
 		break;
 	case atype_enum:
+	case atype_enum_nestable:
 	{
-		const struct lttng_integer_type *itype =
-			&field->type.u.basic.enumeration.container_type;
+		const struct lttng_integer_type *itype;
 
+		if (field->type.atype == atype_enum) {
+			itype = &field->type.u.legacy.basic.enumeration.container_type;
+		} else {
+			itype = &field->type.u.enum_nestable.container_type->u.integer;
+		}
 		if (itype->signedness)
 			load->object_type = OBJECT_TYPE_S64;
 		else
@@ -386,14 +425,30 @@ static int specialize_load_object(const struct lttng_event_field *field,
 		break;
 	}
 	case atype_array:
-		if (field->type.u.array.elem_type.atype != atype_integer) {
+		if (field->type.u.legacy.array.elem_type.atype != atype_integer) {
+			ERR("Array nesting only supports integer types.");
+			return -EINVAL;
+		}
+		if (is_context) {
+			load->object_type = OBJECT_TYPE_STRING;
+		} else {
+			if (field->type.u.legacy.array.elem_type.u.basic.integer.encoding == lttng_encode_none) {
+				load->object_type = OBJECT_TYPE_ARRAY;
+				load->field = field;
+			} else {
+				load->object_type = OBJECT_TYPE_STRING_SEQUENCE;
+			}
+		}
+		break;
+	case atype_array_nestable:
+		if (field->type.u.array_nestable.elem_type->atype != atype_integer) {
 			ERR("Array nesting only supports integer types.");
 			return -EINVAL;
 		}
 		if (is_context) {
 			load->object_type = OBJECT_TYPE_STRING;
 		} else {
-			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) {
 				load->object_type = OBJECT_TYPE_ARRAY;
 				load->field = field;
 			} else {
@@ -402,14 +457,30 @@ static int specialize_load_object(const struct lttng_event_field *field,
 		}
 		break;
 	case atype_sequence:
-		if (field->type.u.sequence.elem_type.atype != atype_integer) {
+		if (field->type.u.legacy.sequence.elem_type.atype != atype_integer) {
+			ERR("Sequence nesting only supports integer types.");
+			return -EINVAL;
+		}
+		if (is_context) {
+			load->object_type = OBJECT_TYPE_STRING;
+		} else {
+			if (field->type.u.legacy.sequence.elem_type.u.basic.integer.encoding == lttng_encode_none) {
+				load->object_type = OBJECT_TYPE_SEQUENCE;
+				load->field = field;
+			} else {
+				load->object_type = OBJECT_TYPE_STRING_SEQUENCE;
+			}
+		}
+		break;
+	case atype_sequence_nestable:
+		if (field->type.u.sequence_nestable.elem_type->atype != atype_integer) {
 			ERR("Sequence nesting only supports integer types.");
 			return -EINVAL;
 		}
 		if (is_context) {
 			load->object_type = OBJECT_TYPE_STRING;
 		} else {
-			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) {
 				load->object_type = OBJECT_TYPE_SEQUENCE;
 				load->field = field;
 			} else {
@@ -417,6 +488,7 @@ static int specialize_load_object(const struct lttng_event_field *field,
 			}
 		}
 		break;
+
 	case atype_string:
 		load->object_type = OBJECT_TYPE_STRING;
 		break;
@@ -436,7 +508,7 @@ static int specialize_load_object(const struct lttng_event_field *field,
 	return 0;
 }
 
-static int specialize_context_lookup(struct lttng_session *session,
+static int specialize_context_lookup(struct lttng_ctx *ctx,
 		struct bytecode_runtime *runtime,
 		struct load_op *insn,
 		struct vstack_load *load)
@@ -447,11 +519,11 @@ static int specialize_context_lookup(struct lttng_session *session,
 	struct filter_get_index_data gid;
 	ssize_t data_offset;
 
-	idx = specialize_context_lookup_name(session->ctx, runtime, insn);
+	idx = specialize_context_lookup_name(ctx, runtime, insn);
 	if (idx < 0) {
 		return -ENOENT;
 	}
-	ctx_field = &session->ctx->fields[idx];
+	ctx_field = &ctx->fields[idx];
 	field = &ctx_field->event_field;
 	ret = specialize_load_object(field, load, true);
 	if (ret)
@@ -470,7 +542,7 @@ static int specialize_context_lookup(struct lttng_session *session,
 	return 0;
 }
 
-static int specialize_app_context_lookup(struct lttng_session *session,
+static int specialize_app_context_lookup(struct lttng_ctx **pctx,
 		struct bytecode_runtime *runtime,
 		struct load_op *insn,
 		struct vstack_load *load)
@@ -493,19 +565,18 @@ static int specialize_app_context_lookup(struct lttng_session *session,
 	}
 	strcpy(name, "$app.");
 	strcat(name, orig_name);
-	idx = lttng_get_context_index(session->ctx, name);
+	idx = lttng_get_context_index(*pctx, name);
 	if (idx < 0) {
 		assert(lttng_context_is_app(name));
 		ret = lttng_ust_add_app_context_to_ctx_rcu(name,
-				&session->ctx);
+				pctx);
 		if (ret)
 			return ret;
-		idx = lttng_get_context_index(session->ctx,
-			name);
+		idx = lttng_get_context_index(*pctx, name);
 		if (idx < 0)
 			return -ENOENT;
 	}
-	ctx_field = &session->ctx->fields[idx];
+	ctx_field = &(*pctx)->fields[idx];
 	field = &ctx_field->event_field;
 	ret = specialize_load_object(field, load, true);
 	if (ret)
@@ -549,6 +620,9 @@ static int specialize_event_payload_lookup(struct lttng_event *event,
 	name = runtime->p.bc->bc.data + runtime->p.bc->bc.reloc_offset + offset;
 	for (i = 0; i < nr_fields; i++) {
 		field = &desc->fields[i];
+		if (field->u.ext.nofilter) {
+			continue;
+		}
 		if (!strcmp(field->name, name)) {
 			found = true;
 			break;
@@ -557,10 +631,13 @@ static int specialize_event_payload_lookup(struct lttng_event *event,
 		switch (field->type.atype) {
 		case atype_integer:
 		case atype_enum:
+		case atype_enum_nestable:
 			field_offset += sizeof(int64_t);
 			break;
 		case atype_array:
+		case atype_array_nestable:
 		case atype_sequence:
+		case atype_sequence_nestable:
 			field_offset += sizeof(unsigned long);
 			field_offset += sizeof(void *);
 			break;
@@ -608,7 +685,7 @@ int lttng_filter_specialize_bytecode(struct lttng_event *event,
 	int ret = -EINVAL;
 	struct vstack _stack;
 	struct vstack *stack = &_stack;
-	struct lttng_session *session = bytecode->p.session;
+	struct lttng_ctx **pctx = bytecode->p.pctx;
 
 	vstack_init(stack);
 
@@ -1335,7 +1412,7 @@ int lttng_filter_specialize_bytecode(struct lttng_event *event,
 				goto end;
 			case LOAD_ROOT_CONTEXT:
 				/* Lookup context field. */
-				ret = specialize_context_lookup(session,
+				ret = specialize_context_lookup(*pctx,
 					bytecode, insn,
 					&vstack_ax(stack)->load);
 				if (ret)
@@ -1343,7 +1420,7 @@ int lttng_filter_specialize_bytecode(struct lttng_event *event,
 				break;
 			case LOAD_ROOT_APP_CONTEXT:
 				/* Lookup app context field. */
-				ret = specialize_app_context_lookup(session,
+				ret = specialize_app_context_lookup(pctx,
 					bytecode, insn,
 					&vstack_ax(stack)->load);
 				if (ret)