X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-bytecode-interpreter.c;h=bba3cac8dcb8991f35238207eb3ba16701eb840e;hb=185c782861fe6ed224d14293afc57c46ab5e7aed;hp=9d7258f7dd81530c9e892912ac017a602e1625b1;hpb=04aa13f8c2944839f6514e3841b93057b443a783;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-bytecode-interpreter.c b/liblttng-ust/lttng-bytecode-interpreter.c
index 9d7258f7..bba3cac8 100644
--- a/liblttng-ust/lttng-bytecode-interpreter.c
+++ b/liblttng-ust/lttng-bytecode-interpreter.c
@@ -172,6 +172,13 @@ uint64_t lttng_bytecode_filter_interpret_false(void *filter_data,
 	return LTTNG_INTERPRETER_DISCARD;
 }
 
+uint64_t lttng_bytecode_capture_interpret_false(void *capture_data,
+		const char *capture_stack_data,
+		struct lttng_interpreter_output *output)
+{
+	return LTTNG_INTERPRETER_DISCARD;
+}
+
 #ifdef INTERPRETER_USE_SWITCH
 
 /*
@@ -267,11 +274,11 @@ static int context_get_index(struct lttng_ctx *ctx,
 		}
 		ctx_field->get_value(ctx_field, &v);
 		if (itype->signedness) {
-			ptr->object_type = OBJECT_TYPE_S64;
+			ptr->object_type = OBJECT_TYPE_SIGNED_ENUM;
 			ptr->u.s64 = v.u.s64;
 			ptr->ptr = &ptr->u.s64;
 		} else {
-			ptr->object_type = OBJECT_TYPE_U64;
+			ptr->object_type = OBJECT_TYPE_UNSIGNED_ENUM;
 			ptr->u.u64 = v.u.s64;	/* Cast. */
 			ptr->ptr = &ptr->u.u64;
 		}
@@ -345,12 +352,25 @@ static int context_get_index(struct lttng_ctx *ctx,
 		switch (v.sel) {
 		case LTTNG_UST_DYNAMIC_TYPE_NONE:
 			return -EINVAL;
+		case LTTNG_UST_DYNAMIC_TYPE_U8:
+		case LTTNG_UST_DYNAMIC_TYPE_U16:
+		case LTTNG_UST_DYNAMIC_TYPE_U32:
+		case LTTNG_UST_DYNAMIC_TYPE_U64:
+			ptr->object_type = OBJECT_TYPE_U64;
+			ptr->u.u64 = v.u.u64;
+			ptr->ptr = &ptr->u.u64;
+			dbg_printf("context get index dynamic u64 %" PRIi64 "\n", ptr->u.u64);
+			break;
+		case LTTNG_UST_DYNAMIC_TYPE_S8:
+		case LTTNG_UST_DYNAMIC_TYPE_S16:
+		case LTTNG_UST_DYNAMIC_TYPE_S32:
 		case LTTNG_UST_DYNAMIC_TYPE_S64:
 			ptr->object_type = OBJECT_TYPE_S64;
 			ptr->u.s64 = v.u.s64;
 			ptr->ptr = &ptr->u.s64;
 			dbg_printf("context get index dynamic s64 %" PRIi64 "\n", ptr->u.s64);
 			break;
+		case LTTNG_UST_DYNAMIC_TYPE_FLOAT:
 		case LTTNG_UST_DYNAMIC_TYPE_DOUBLE:
 			ptr->object_type = OBJECT_TYPE_DOUBLE;
 			ptr->u.d = v.u.d;
@@ -523,6 +543,18 @@ static int dynamic_load_field(struct estack_entry *stack_top)
 		stack_top->type = REG_S64;
 		break;
 	}
+	case OBJECT_TYPE_SIGNED_ENUM:
+	{
+		int64_t tmp;
+
+		dbg_printf("op load field signed enumeration\n");
+		tmp = *(int64_t *) stack_top->u.ptr.ptr;
+		if (stack_top->u.ptr.rev_bo)
+			tmp = bswap_64(tmp);
+		stack_top->u.v = tmp;
+		stack_top->type = REG_S64;
+		break;
+	}
 	case OBJECT_TYPE_U8:
 		dbg_printf("op load field u8\n");
 		stack_top->u.v = *(uint8_t *) stack_top->u.ptr.ptr;
@@ -564,6 +596,18 @@ static int dynamic_load_field(struct estack_entry *stack_top)
 		stack_top->type = REG_U64;
 		break;
 	}
+	case OBJECT_TYPE_UNSIGNED_ENUM:
+	{
+		uint64_t tmp;
+
+		dbg_printf("op load field unsigned enumeration\n");
+		tmp = *(uint64_t *) stack_top->u.ptr.ptr;
+		if (stack_top->u.ptr.rev_bo)
+			tmp = bswap_64(tmp);
+		stack_top->u.v = tmp;
+		stack_top->type = REG_U64;
+		break;
+	}
 	case OBJECT_TYPE_DOUBLE:
 		memcpy(&stack_top->u.d,
 			stack_top->u.ptr.ptr,
@@ -683,6 +727,20 @@ again:
 			output->u.sequence.nr_elem = ax->u.ptr.field->type.u.array_nestable.length;
 			output->u.sequence.nested_type = ax->u.ptr.field->type.u.array_nestable.elem_type;
 			break;
+		case OBJECT_TYPE_SIGNED_ENUM:
+			ret = dynamic_load_field(ax);
+			if (ret)
+				return ret;
+			output->type = LTTNG_INTERPRETER_TYPE_SIGNED_ENUM;
+			output->u.s = ax->u.v;
+			break;
+		case OBJECT_TYPE_UNSIGNED_ENUM:
+			ret = dynamic_load_field(ax);
+			if (ret)
+				return ret;
+			output->type = LTTNG_INTERPRETER_TYPE_UNSIGNED_ENUM;
+			output->u.u = ax->u.v;
+			break;
 		case OBJECT_TYPE_STRUCT:
 		case OBJECT_TYPE_VARIANT:
 		default:
@@ -700,9 +758,12 @@ again:
 }
 
 /*
- * Return 0 (discard), or raise the 0x1 flag (log event).
- * Currently, other flags are kept for future extensions and have no
- * effect.
+ * For `output` equal to NULL:
+ *  Return 0 (discard), or raise the 0x1 flag (log event).
+ *  Currently, other flags are kept for future extensions and have no
+ *  effect.
+ * For `output` not equal to NULL:
+ *  Return 0 on success, negative error value on error.
  */
 static
 uint64_t bytecode_interpret(void *interpreter_data,
@@ -2493,6 +2554,14 @@ uint64_t lttng_bytecode_filter_interpret(void *filter_data,
 	return bytecode_interpret(filter_data, filter_stack_data, NULL);
 }
 
+uint64_t lttng_bytecode_capture_interpret(void *capture_data,
+		const char *capture_stack_data,
+		struct lttng_interpreter_output *output)
+{
+	return bytecode_interpret(capture_data, capture_stack_data,
+			(struct lttng_interpreter_output *) output);
+}
+
 #undef START_OP
 #undef OP
 #undef PO