X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-interpreter.c;h=df4add225dbb2585548b6bcb740a4aaa026772b8;hb=35c7fa927fef4a851f5a22b78b7fe883789f2a5d;hp=690ebde9eece5e1dbb4695e067f014d895bf8a73;hpb=8a92ed2aba5250d41e31d1af5620a2317105c91a;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter-interpreter.c b/liblttng-ust/lttng-filter-interpreter.c
index 690ebde9..df4add22 100644
--- a/liblttng-ust/lttng-filter-interpreter.c
+++ b/liblttng-ust/lttng-filter-interpreter.c
@@ -58,19 +58,29 @@ int stack_strcmp(struct estack *stack, int top, const char *cmp_type)
 	for (;;) {
 		int escaped_r0 = 0;
 
-		if (unlikely(p - estack_bx(stack, top)->u.s.str > estack_bx(stack, top)->u.s.seq_len || *p == '\0')) {
-			if (q - estack_ax(stack, top)->u.s.str > estack_ax(stack, top)->u.s.seq_len || *q == '\0')
-				diff = 0;
-			else
-				diff = -1;
-			break;
+		if (unlikely(p - estack_bx(stack, top)->u.s.str >= estack_bx(stack, top)->u.s.seq_len || *p == '\0')) {
+			if (q - estack_ax(stack, top)->u.s.str >= estack_ax(stack, top)->u.s.seq_len || *q == '\0') {
+				return 0;
+			} else {
+				if (estack_ax(stack, top)->u.s.literal) {
+					ret = parse_char(&q);
+					if (ret == -1)
+						return 0;
+				}
+				return -1;
+			}
 		}
-		if (unlikely(q - estack_ax(stack, top)->u.s.str > estack_ax(stack, top)->u.s.seq_len || *q == '\0')) {
-			if (p - estack_bx(stack, top)->u.s.str > estack_bx(stack, top)->u.s.seq_len || *p == '\0')
-				diff = 0;
-			else
-				diff = 1;
-			break;
+		if (unlikely(q - estack_ax(stack, top)->u.s.str >= estack_ax(stack, top)->u.s.seq_len || *q == '\0')) {
+			if (p - estack_bx(stack, top)->u.s.str >= estack_bx(stack, top)->u.s.seq_len || *p == '\0') {
+				return 0;
+			} else {
+				if (estack_bx(stack, top)->u.s.literal) {
+					ret = parse_char(&p);
+					if (ret == -1)
+						return 0;
+				}
+				return 1;
+			}
 		}
 		if (estack_bx(stack, top)->u.s.literal) {
 			ret = parse_char(&p);
@@ -168,7 +178,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 	struct bytecode_runtime *bytecode = filter_data;
 	void *pc, *next_pc, *start_pc;
 	int ret = -EINVAL;
-	int retval = 0;
+	uint64_t retval = 0;
 	struct estack _stack;
 	struct estack *stack = &_stack;
 	register int64_t ax = 0, bx = 0;
@@ -253,13 +263,14 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		[ FILTER_OP_AND ] = &&LABEL_FILTER_OP_AND,
 		[ FILTER_OP_OR ] = &&LABEL_FILTER_OP_OR,
 
-		/* load */
+		/* load field ref */
 		[ FILTER_OP_LOAD_FIELD_REF ] = &&LABEL_FILTER_OP_LOAD_FIELD_REF,
 		[ FILTER_OP_LOAD_FIELD_REF_STRING ] = &&LABEL_FILTER_OP_LOAD_FIELD_REF_STRING,
 		[ FILTER_OP_LOAD_FIELD_REF_SEQUENCE ] = &&LABEL_FILTER_OP_LOAD_FIELD_REF_SEQUENCE,
 		[ FILTER_OP_LOAD_FIELD_REF_S64 ] = &&LABEL_FILTER_OP_LOAD_FIELD_REF_S64,
 		[ FILTER_OP_LOAD_FIELD_REF_DOUBLE ] = &&LABEL_FILTER_OP_LOAD_FIELD_REF_DOUBLE,
 
+		/* load from immediate operand */
 		[ FILTER_OP_LOAD_STRING ] = &&LABEL_FILTER_OP_LOAD_STRING,
 		[ FILTER_OP_LOAD_S64 ] = &&LABEL_FILTER_OP_LOAD_S64,
 		[ FILTER_OP_LOAD_DOUBLE ] = &&LABEL_FILTER_OP_LOAD_DOUBLE,
@@ -268,6 +279,12 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		[ FILTER_OP_CAST_TO_S64 ] = &&LABEL_FILTER_OP_CAST_TO_S64,
 		[ FILTER_OP_CAST_DOUBLE_TO_S64 ] = &&LABEL_FILTER_OP_CAST_DOUBLE_TO_S64,
 		[ FILTER_OP_CAST_NOP ] = &&LABEL_FILTER_OP_CAST_NOP,
+
+		/* get context ref */
+		[ FILTER_OP_GET_CONTEXT_REF ] = &&LABEL_FILTER_OP_GET_CONTEXT_REF,
+		[ FILTER_OP_GET_CONTEXT_REF_STRING ] = &&LABEL_FILTER_OP_GET_CONTEXT_REF_STRING,
+		[ FILTER_OP_GET_CONTEXT_REF_S64 ] = &&LABEL_FILTER_OP_GET_CONTEXT_REF_S64,
+		[ FILTER_OP_GET_CONTEXT_REF_DOUBLE ] = &&LABEL_FILTER_OP_GET_CONTEXT_REF_DOUBLE,
 	};
 #endif /* #ifndef INTERPRETER_USE_SWITCH */
 
@@ -275,6 +292,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 
 		OP(FILTER_OP_UNKNOWN):
 		OP(FILTER_OP_LOAD_FIELD_REF):
+		OP(FILTER_OP_GET_CONTEXT_REF):
 #ifdef INTERPRETER_USE_SWITCH
 		default:
 #endif /* INTERPRETER_USE_SWITCH */
@@ -700,7 +718,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		}
 
 
-		/* load */
+		/* load field ref */
 		OP(FILTER_OP_LOAD_FIELD_REF_STRING):
 		{
 			struct load_op *insn = (struct load_op *) pc;
@@ -776,6 +794,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			PO;
 		}
 
+		/* load from immediate operand */
 		OP(FILTER_OP_LOAD_STRING):
 		{
 			struct load_op *insn = (struct load_op *) pc;
@@ -834,6 +853,68 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			PO;
 		}
 
+		/* get context ref */
+		OP(FILTER_OP_GET_CONTEXT_REF_STRING):
+		{
+			struct load_op *insn = (struct load_op *) pc;
+			struct field_ref *ref = (struct field_ref *) insn->data;
+			struct lttng_ctx_field *ctx_field;
+			union lttng_ctx_value v;
+
+			dbg_printf("get context ref offset %u type string\n",
+				ref->offset);
+			ctx_field = &lttng_static_ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field, &v);
+			estack_push(stack, top, ax, bx);
+			estack_ax(stack, top)->u.s.str = v.str;
+			if (unlikely(!estack_ax(stack, top)->u.s.str)) {
+				dbg_printf("Filter warning: loading a NULL string.\n");
+				ret = -EINVAL;
+				goto end;
+			}
+			estack_ax(stack, top)->u.s.seq_len = UINT_MAX;
+			estack_ax(stack, top)->u.s.literal = 0;
+			dbg_printf("ref get context string %s\n", estack_ax(stack, top)->u.s.str);
+			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+			PO;
+		}
+
+		OP(FILTER_OP_GET_CONTEXT_REF_S64):
+		{
+			struct load_op *insn = (struct load_op *) pc;
+			struct field_ref *ref = (struct field_ref *) insn->data;
+			struct lttng_ctx_field *ctx_field;
+			union lttng_ctx_value v;
+
+			dbg_printf("get context ref offset %u type s64\n",
+				ref->offset);
+			ctx_field = &lttng_static_ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field, &v);
+			estack_push(stack, top, ax, bx);
+			estack_ax_v = v.s64;
+			dbg_printf("ref get context s64 %" PRIi64 "\n", estack_ax_v);
+			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+			PO;
+		}
+
+		OP(FILTER_OP_GET_CONTEXT_REF_DOUBLE):
+		{
+			struct load_op *insn = (struct load_op *) pc;
+			struct field_ref *ref = (struct field_ref *) insn->data;
+			struct lttng_ctx_field *ctx_field;
+			union lttng_ctx_value v;
+
+			dbg_printf("get context ref offset %u type double\n",
+				ref->offset);
+			ctx_field = &lttng_static_ctx->fields[ref->offset];
+			ctx_field->get_value(ctx_field, &v);
+			estack_push(stack, top, ax, bx);
+			memcpy(&estack_ax(stack, top)->u.d, &v.d, sizeof(struct literal_double));
+			dbg_printf("ref get context double %g\n", estack_ax(stack, top)->u.d);
+			next_pc += sizeof(struct load_op) + sizeof(struct field_ref);
+			PO;
+		}
+
 	END_OP
 end:
 	/* return 0 (discard) on error */