X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-interpreter.c;h=5255bb73238ea7bb6def6dfd136229028ab326e0;hb=4526ba6908b141a77d711bb38d2971f640ce5a7e;hp=7efa883f2da674ae391fd8bc0ce2adf1993376f2;hpb=0245c698528954caad460f2e6728e4a593d8951e;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter-interpreter.c b/liblttng-ust/lttng-filter-interpreter.c
index 7efa883f..5255bb73 100644
--- a/liblttng-ust/lttng-filter-interpreter.c
+++ b/liblttng-ust/lttng-filter-interpreter.c
@@ -164,7 +164,7 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 uint64_t lttng_filter_false(void *filter_data,
 		const char *filter_stack_data)
 {
-	return 0;
+	return LTTNG_FILTER_DISCARD;
 }
 
 #ifdef INTERPRETER_USE_SWITCH
@@ -238,7 +238,7 @@ static int context_get_index(struct lttng_ctx *ctx,
 	switch (field->type.atype) {
 	case atype_integer:
 		ctx_field->get_value(ctx_field, &v);
-		if (field->type.u.basic.integer.signedness) {
+		if (field->type.u.integer.signedness) {
 			ptr->object_type = OBJECT_TYPE_S64;
 			ptr->u.s64 = v.u.s64;
 			ptr->ptr = &ptr->u.s64;
@@ -248,11 +248,16 @@ static int context_get_index(struct lttng_ctx *ctx,
 			ptr->ptr = &ptr->u.u64;
 		}
 		break;
-	case atype_enum:
+	case atype_enum:	/* Fall-through */
+	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;
+		}
 		ctx_field->get_value(ctx_field, &v);
 		if (itype->signedness) {
 			ptr->object_type = OBJECT_TYPE_S64;
@@ -266,11 +271,24 @@ static int context_get_index(struct lttng_ctx *ctx,
 		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 (field->type.u.legacy.array.elem_type.u.basic.integer.encoding == lttng_encode_none) {
+			ERR("Only string arrays are supported for contexts.");
+			return -EINVAL;
+		}
+		ptr->object_type = OBJECT_TYPE_STRING;
+		ctx_field->get_value(ctx_field, &v);
+		ptr->ptr = v.u.str;
+		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 (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) {
 			ERR("Only string arrays are supported for contexts.");
 			return -EINVAL;
 		}
@@ -279,11 +297,24 @@ static int context_get_index(struct lttng_ctx *ctx,
 		ptr->ptr = v.u.str;
 		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 (field->type.u.sequence.elem_type.u.basic.integer.encoding == lttng_encode_none) {
+		if (field->type.u.legacy.sequence.elem_type.u.basic.integer.encoding == lttng_encode_none) {
+			ERR("Only string sequences are supported for contexts.");
+			return -EINVAL;
+		}
+		ptr->object_type = OBJECT_TYPE_STRING;
+		ctx_field->get_value(ctx_field, &v);
+		ptr->ptr = v.u.str;
+		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 (field->type.u.sequence_nestable.elem_type->u.integer.encoding == lttng_encode_none) {
 			ERR("Only string sequences are supported for contexts.");
 			return -EINVAL;
 		}
@@ -499,7 +530,7 @@ static int dynamic_load_field(struct estack_entry *stack_top)
 	{
 		uint16_t tmp;
 
-		dbg_printf("op load field s16\n");
+		dbg_printf("op load field u16\n");
 		tmp = *(uint16_t *) stack_top->u.ptr.ptr;
 		if (stack_top->u.ptr.rev_bo)
 			tmp = bswap_16(tmp);
@@ -762,7 +793,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			goto end;
 
 		OP(FILTER_OP_RETURN):
-			/* LTTNG_FILTER_DISCARD  or LTTNG_FILTER_RECORD_FLAG */
+			/* LTTNG_FILTER_DISCARD or LTTNG_FILTER_RECORD_FLAG */
 			/* Handle dynamic typing. */
 			switch (estack_ax_t) {
 			case REG_S64:
@@ -779,7 +810,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			goto end;
 
 		OP(FILTER_OP_RETURN_S64):
-			/* LTTNG_FILTER_DISCARD  or LTTNG_FILTER_RECORD_FLAG */
+			/* LTTNG_FILTER_DISCARD or LTTNG_FILTER_RECORD_FLAG */
 			retval = !!estack_ax_v;
 			ret = 0;
 			goto end;
@@ -2336,9 +2367,9 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 
 	END_OP
 end:
-	/* return 0 (discard) on error */
+	/* Return _DISCARD on error. */
 	if (ret)
-		return 0;
+		return LTTNG_FILTER_DISCARD;
 	return retval;
 }