X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-interpreter.c;h=49daa211e1a59b3e24d59bfa00faceda9de2115b;hb=a44d07dac81c3444b6da551db9fb774a7402a9ef;hp=753880c3e269692072f9a6c416a22868e86e77ce;hpb=4e8f9a89eef37ea1228dff49f7a38330d2b42633;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter-interpreter.c b/liblttng-ust/lttng-filter-interpreter.c
index 753880c3..49daa211 100644
--- a/liblttng-ust/lttng-filter-interpreter.c
+++ b/liblttng-ust/lttng-filter-interpreter.c
@@ -25,9 +25,10 @@
  */
 
 #define _LGPL_SOURCE
-#include <urcu-pointer.h>
+#include <stddef.h>
 #include <stdint.h>
-#include <byteswap.h>
+#include <urcu-pointer.h>
+#include <lttng/ust-endian.h>
 #include "lttng-filter.h"
 #include "string-utils.h"
 
@@ -163,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
@@ -237,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;
@@ -247,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;
@@ -265,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.array.elem_type.u.basic.integer.encoding == lttng_encode_none) {
+		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_nestable.elem_type->u.integer.encoding == lttng_encode_none) {
 			ERR("Only string arrays are supported for contexts.");
 			return -EINVAL;
 		}
@@ -278,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;
 		}
@@ -297,6 +329,7 @@ static int context_get_index(struct lttng_ctx *ctx,
 		break;
 	case atype_float:
 		ptr->object_type = OBJECT_TYPE_DOUBLE;
+		ctx_field->get_value(ctx_field, &v);
 		ptr->u.d = v.u.d;
 		ptr->ptr = &ptr->u.d;
 		break;
@@ -337,7 +370,7 @@ static int context_get_index(struct lttng_ctx *ctx,
 	return 0;
 }
 
-static int dynamic_get_index(struct lttng_session *session,
+static int dynamic_get_index(struct lttng_ctx *ctx,
 		struct bytecode_runtime *runtime,
 		uint64_t index, struct estack_entry *stack_top)
 {
@@ -404,9 +437,6 @@ static int dynamic_get_index(struct lttng_session *session,
 	case LOAD_ROOT_CONTEXT:
 	case LOAD_ROOT_APP_CONTEXT:	/* Fall-through */
 	{
-		struct lttng_ctx *ctx;
-
-		ctx = rcu_dereference(session->ctx);
 		ret = context_get_index(ctx,
 				&stack_top->u.ptr,
 				gid->ctx_index);
@@ -497,7 +527,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);
@@ -601,7 +631,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		const char *filter_stack_data)
 {
 	struct bytecode_runtime *bytecode = filter_data;
-	struct lttng_session *session = bytecode->p.session;
+	struct lttng_ctx *ctx = rcu_dereference(*bytecode->p.pctx);
 	void *pc, *next_pc, *start_pc;
 	int ret = -EINVAL;
 	uint64_t retval = 0;
@@ -742,6 +772,8 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		[ FILTER_OP_LOAD_FIELD_DOUBLE ] = &&LABEL_FILTER_OP_LOAD_FIELD_DOUBLE,
 
 		[ FILTER_OP_UNARY_BIT_NOT ] = &&LABEL_FILTER_OP_UNARY_BIT_NOT,
+
+		[ FILTER_OP_RETURN_S64 ] = &&LABEL_FILTER_OP_RETURN_S64,
 	};
 #endif /* #ifndef INTERPRETER_USE_SWITCH */
 
@@ -758,7 +790,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:
@@ -774,6 +806,12 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			ret = 0;
 			goto end;
 
+		OP(FILTER_OP_RETURN_S64):
+			/* LTTNG_FILTER_DISCARD or LTTNG_FILTER_RECORD_FLAG */
+			retval = !!estack_ax_v;
+			ret = 0;
+			goto end;
+
 		/* binary */
 		OP(FILTER_OP_MUL):
 		OP(FILTER_OP_DIV):
@@ -1972,13 +2010,11 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			struct load_op *insn = (struct load_op *) pc;
 			struct field_ref *ref = (struct field_ref *) insn->data;
-			struct lttng_ctx *ctx;
 			struct lttng_ctx_field *ctx_field;
 			struct lttng_ctx_value v;
 
 			dbg_printf("get context ref offset %u type dynamic\n",
 				ref->offset);
-			ctx = rcu_dereference(session->ctx);
 			ctx_field = &ctx->fields[ref->offset];
 			ctx_field->get_value(ctx_field, &v);
 			estack_push(stack, top, ax, bx, ax_t, bx_t);
@@ -2022,13 +2058,11 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			struct load_op *insn = (struct load_op *) pc;
 			struct field_ref *ref = (struct field_ref *) insn->data;
-			struct lttng_ctx *ctx;
 			struct lttng_ctx_field *ctx_field;
 			struct lttng_ctx_value v;
 
 			dbg_printf("get context ref offset %u type string\n",
 				ref->offset);
-			ctx = rcu_dereference(session->ctx);
 			ctx_field = &ctx->fields[ref->offset];
 			ctx_field->get_value(ctx_field, &v);
 			estack_push(stack, top, ax, bx, ax_t, bx_t);
@@ -2051,13 +2085,11 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			struct load_op *insn = (struct load_op *) pc;
 			struct field_ref *ref = (struct field_ref *) insn->data;
-			struct lttng_ctx *ctx;
 			struct lttng_ctx_field *ctx_field;
 			struct lttng_ctx_value v;
 
 			dbg_printf("get context ref offset %u type s64\n",
 				ref->offset);
-			ctx = rcu_dereference(session->ctx);
 			ctx_field = &ctx->fields[ref->offset];
 			ctx_field->get_value(ctx_field, &v);
 			estack_push(stack, top, ax, bx, ax_t, bx_t);
@@ -2072,13 +2104,11 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		{
 			struct load_op *insn = (struct load_op *) pc;
 			struct field_ref *ref = (struct field_ref *) insn->data;
-			struct lttng_ctx *ctx;
 			struct lttng_ctx_field *ctx_field;
 			struct lttng_ctx_value v;
 
 			dbg_printf("get context ref offset %u type double\n",
 				ref->offset);
-			ctx = rcu_dereference(session->ctx);
 			ctx_field = &ctx->fields[ref->offset];
 			ctx_field->get_value(ctx_field, &v);
 			estack_push(stack, top, ax, bx, ax_t, bx_t);
@@ -2164,7 +2194,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			struct get_index_u16 *index = (struct get_index_u16 *) insn->data;
 
 			dbg_printf("op get index u16\n");
-			ret = dynamic_get_index(session, bytecode, index->index, estack_ax(stack, top));
+			ret = dynamic_get_index(ctx, bytecode, index->index, estack_ax(stack, top));
 			if (ret)
 				goto end;
 			estack_ax_v = estack_ax(stack, top)->u.v;
@@ -2179,7 +2209,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			struct get_index_u64 *index = (struct get_index_u64 *) insn->data;
 
 			dbg_printf("op get index u64\n");
-			ret = dynamic_get_index(session, bytecode, index->index, estack_ax(stack, top));
+			ret = dynamic_get_index(ctx, bytecode, index->index, estack_ax(stack, top));
 			if (ret)
 				goto end;
 			estack_ax_v = estack_ax(stack, top)->u.v;
@@ -2326,9 +2356,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;
 }