X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-filter.c;h=6ff6be8f2a6888b4ecd7a61bce8ef25ff9830738;hb=263b6c88138c3354d63dba3c70a965de94becd22;hp=325ae7bbc0538c975ca00bcd305f9ba4cc4fd063;hpb=9f36eaed6f91d5897924b551b44d1edd8cee00e2;p=lttng-modules.git

diff --git a/lttng-filter.c b/lttng-filter.c
index 325ae7bb..6ff6be8f 100644
--- a/lttng-filter.c
+++ b/lttng-filter.c
@@ -191,6 +191,8 @@ int apply_field_reloc(struct lttng_event *event,
 		return -EINVAL;
 	nr_fields = desc->nr_fields;
 	for (i = 0; i < nr_fields; i++) {
+		if (fields[i].nofilter)
+			continue;
 		if (!strcmp(fields[i].name, field_name)) {
 			field = &fields[i];
 			break;
@@ -198,23 +200,26 @@ int apply_field_reloc(struct lttng_event *event,
 		/* compute field offset */
 		switch (fields[i].type.atype) {
 		case atype_integer:
-		case atype_enum:
+		case atype_enum_nestable:
 			field_offset += sizeof(int64_t);
 			break;
-		case atype_array:
-		case atype_sequence:
-		case atype_array_bitfield:
-		case atype_sequence_bitfield:
+		case atype_array_nestable:
+			if (!lttng_is_bytewise_integer(fields[i].type.u.array_nestable.elem_type))
+				return -EINVAL;
+			field_offset += sizeof(unsigned long);
+			field_offset += sizeof(void *);
+			break;
+		case atype_sequence_nestable:
+			if (!lttng_is_bytewise_integer(fields[i].type.u.sequence_nestable.elem_type))
+				return -EINVAL;
 			field_offset += sizeof(unsigned long);
 			field_offset += sizeof(void *);
 			break;
 		case atype_string:
 			field_offset += sizeof(void *);
 			break;
-		case atype_struct:		/* Unsupported. */
-		case atype_array_compound:	/* Unsupported. */
-		case atype_sequence_compound:	/* Unsupported. */
-		case atype_variant:		/* Unsupported. */
+		case atype_struct_nestable:	/* Unsupported. */
+		case atype_variant_nestable:	/* Unsupported. */
 		default:
 			return -EINVAL;
 		}
@@ -237,11 +242,11 @@ int apply_field_reloc(struct lttng_event *event,
 		field_ref = (struct field_ref *) op->data;
 		switch (field->type.atype) {
 		case atype_integer:
-		case atype_enum:
+		case atype_enum_nestable:
 			op->op = FILTER_OP_LOAD_FIELD_REF_S64;
 			break;
-		case atype_array:
-		case atype_sequence:
+		case atype_array_nestable:
+		case atype_sequence_nestable:
 			if (field->user)
 				op->op = FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE;
 			else
@@ -253,12 +258,8 @@ int apply_field_reloc(struct lttng_event *event,
 			else
 				op->op = FILTER_OP_LOAD_FIELD_REF_STRING;
 			break;
-		case atype_struct:		/* Unsupported. */
-		case atype_array_compound:	/* Unsupported. */
-		case atype_sequence_compound:	/* Unsupported. */
-		case atype_variant:		/* Unsupported. */
-		case atype_array_bitfield:	/* Unsupported. */
-		case atype_sequence_bitfield:	/* Unsupported. */
+		case atype_struct_nestable:	/* Unsupported. */
+		case atype_variant_nestable:	/* Unsupported. */
 		default:
 			return -EINVAL;
 		}
@@ -307,22 +308,28 @@ int apply_context_reloc(struct lttng_event *event,
 		field_ref = (struct field_ref *) op->data;
 		switch (ctx_field->event_field.type.atype) {
 		case atype_integer:
-		case atype_enum:
+		case atype_enum_nestable:
 			op->op = FILTER_OP_GET_CONTEXT_REF_S64;
 			break;
 			/* Sequence and array supported as string */
 		case atype_string:
-		case atype_array:
-		case atype_sequence:
 			BUG_ON(ctx_field->event_field.user);
 			op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
 			break;
-		case atype_struct:	/* Unsupported. */
-		case atype_array_compound:	/* Unsupported. */
-		case atype_sequence_compound:	/* Unsupported. */
-		case atype_variant:		/* Unsupported. */
-		case atype_array_bitfield:	/* Unsupported. */
-		case atype_sequence_bitfield:	/* Unsupported. */
+		case atype_array_nestable:
+			if (!lttng_is_bytewise_integer(ctx_field->event_field.type.u.array_nestable.elem_type))
+				return -EINVAL;
+			BUG_ON(ctx_field->event_field.user);
+			op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
+			break;
+		case atype_sequence_nestable:
+			if (!lttng_is_bytewise_integer(ctx_field->event_field.type.u.sequence_nestable.elem_type))
+				return -EINVAL;
+			BUG_ON(ctx_field->event_field.user);
+			op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
+			break;
+		case atype_struct_nestable:	/* Unsupported. */
+		case atype_variant_nestable:	/* Unsupported. */
 		default:
 			return -EINVAL;
 		}
@@ -503,11 +510,12 @@ void lttng_enabler_event_link_bytecode(struct lttng_event *event,
 
 		/*
 		 * Insert at specified priority (seqnum) in increasing
-		 * order.
+		 * order. If there already is a bytecode of the same priority,
+		 * insert the new bytecode right after it.
 		 */
 		list_for_each_entry_reverse(runtime,
 				&event->bytecode_runtime_head, node) {
-			if (runtime->bc->bc.seqnum < bc->bc.seqnum) {
+			if (runtime->bc->bc.seqnum <= bc->bc.seqnum) {
 				/* insert here */
 				insert_loc = &runtime->node;
 				goto add_within;