X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-filter-specialize.c;h=09b5e45e73658a8a8a29445be1f149d6d92b50de;hb=3151a51df2b93554f3e4559a2e7ec08541e8674d;hp=92196dfb17bcf64e9138da8ac6569b4a4906d389;hpb=e85a0294955aee3dfa48d2a8c18646a16d7b8750;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-filter-specialize.c b/liblttng-ust/lttng-filter-specialize.c
index 92196dfb..09b5e45e 100644
--- a/liblttng-ust/lttng-filter-specialize.c
+++ b/liblttng-ust/lttng-filter-specialize.c
@@ -80,7 +80,15 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 			case REG_STRING:
 				if (vstack_bx(stack)->type == REG_UNKNOWN)
 					break;
-				insn->op = FILTER_OP_EQ_STRING;
+				if (vstack_bx(stack)->type == REG_STAR_GLOB_STRING)
+					insn->op = FILTER_OP_EQ_STAR_GLOB_STRING;
+				else
+					insn->op = FILTER_OP_EQ_STRING;
+				break;
+			case REG_STAR_GLOB_STRING:
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				insn->op = FILTER_OP_EQ_STAR_GLOB_STRING;
 				break;
 			case REG_S64:
 				if (vstack_bx(stack)->type == REG_UNKNOWN)
@@ -124,7 +132,15 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 			case REG_STRING:
 				if (vstack_bx(stack)->type == REG_UNKNOWN)
 					break;
-				insn->op = FILTER_OP_NE_STRING;
+				if (vstack_bx(stack)->type == REG_STAR_GLOB_STRING)
+					insn->op = FILTER_OP_NE_STAR_GLOB_STRING;
+				else
+					insn->op = FILTER_OP_NE_STRING;
+				break;
+			case REG_STAR_GLOB_STRING:
+				if (vstack_bx(stack)->type == REG_UNKNOWN)
+					break;
+				insn->op = FILTER_OP_NE_STAR_GLOB_STRING;
 				break;
 			case REG_S64:
 				if (vstack_bx(stack)->type == REG_UNKNOWN)
@@ -165,6 +181,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 				ret = -EINVAL;
 				goto end;
 
+			case REG_STAR_GLOB_STRING:
+				ERR("invalid register type for > binary operator\n");
+				ret = -EINVAL;
+				goto end;
 			case REG_STRING:
 				if (vstack_bx(stack)->type == REG_UNKNOWN)
 					break;
@@ -209,6 +229,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 				ret = -EINVAL;
 				goto end;
 
+			case REG_STAR_GLOB_STRING:
+				ERR("invalid register type for < binary operator\n");
+				ret = -EINVAL;
+				goto end;
 			case REG_STRING:
 				if (vstack_bx(stack)->type == REG_UNKNOWN)
 					break;
@@ -253,6 +277,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 				ret = -EINVAL;
 				goto end;
 
+			case REG_STAR_GLOB_STRING:
+				ERR("invalid register type for >= binary operator\n");
+				ret = -EINVAL;
+				goto end;
 			case REG_STRING:
 				if (vstack_bx(stack)->type == REG_UNKNOWN)
 					break;
@@ -296,6 +324,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 				ret = -EINVAL;
 				goto end;
 
+			case REG_STAR_GLOB_STRING:
+				ERR("invalid register type for <= binary operator\n");
+				ret = -EINVAL;
+				goto end;
 			case REG_STRING:
 				if (vstack_bx(stack)->type == REG_UNKNOWN)
 					break;
@@ -331,6 +363,8 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 		case FILTER_OP_LT_STRING:
 		case FILTER_OP_GE_STRING:
 		case FILTER_OP_LE_STRING:
+		case FILTER_OP_EQ_STAR_GLOB_STRING:
+		case FILTER_OP_NE_STAR_GLOB_STRING:
 		case FILTER_OP_EQ_S64:
 		case FILTER_OP_NE_S64:
 		case FILTER_OP_GT_S64:
@@ -532,6 +566,19 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 			break;
 		}
 
+		case FILTER_OP_LOAD_STAR_GLOB_STRING:
+		{
+			struct load_op *insn = (struct load_op *) pc;
+
+			if (vstack_push(stack)) {
+				ret = -EINVAL;
+				goto end;
+			}
+			vstack_ax(stack)->type = REG_STAR_GLOB_STRING;
+			next_pc += sizeof(struct load_op) + strlen(insn->data) + 1;
+			break;
+		}
+
 		case FILTER_OP_LOAD_S64:
 		{
 			if (vstack_push(stack)) {
@@ -568,6 +615,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 				goto end;
 
 			case REG_STRING:
+			case REG_STAR_GLOB_STRING:
 				ERR("Cast op can only be applied to numeric or floating point registers\n");
 				ret = -EINVAL;
 				goto end;