X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter.c;fp=liblttng-ust%2Flttng-filter.c;h=1967d540bd99b4f9f46f8140042d35e004d10667;hb=218deb69baab57ee2f6728eef18e84697f21197b;hp=ed41a0efc12b277777523cbf4824346890927641;hpb=f9ec4a97118c6ba6001af5a85d63512e0fc441a1;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter.c b/liblttng-ust/lttng-filter.c
index ed41a0ef..1967d540 100644
--- a/liblttng-ust/lttng-filter.c
+++ b/liblttng-ust/lttng-filter.c
@@ -211,6 +211,9 @@ 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].u.ext.nofilter) {
+			continue;
+		}
 		if (!strcmp(fields[i].name, field_name)) {
 			field = &fields[i];
 			break;
@@ -219,10 +222,13 @@ int apply_field_reloc(struct lttng_event *event,
 		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_array_nestable:
 		case atype_sequence:
+		case atype_sequence_nestable:
 			field_offset += sizeof(unsigned long);
 			field_offset += sizeof(void *);
 			break;
@@ -255,10 +261,13 @@ int apply_field_reloc(struct lttng_event *event,
 		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_array_nestable:
 		case atype_sequence:
+		case atype_sequence_nestable:
 			op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
 			break;
 		case atype_string:
@@ -330,12 +339,15 @@ int apply_context_reloc(struct lttng_event *event,
 		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_array_nestable:
 		case atype_sequence:
+		case atype_sequence_nestable:
 			op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
 			break;
 		case atype_float: