X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-filter-specialize.c;h=318d051abc1bd2871683bd0b1bf03864b56be774;hb=0c13b510ff211153271e47db7a74a8f87fc8e292;hp=667689552bbcb5697ee47bd174260f293395f90b;hpb=bbf3aef542f1d86cb2a2a304444ef7529d01eb6b;p=lttng-modules.git

diff --git a/lttng-filter-specialize.c b/lttng-filter-specialize.c
index 66768955..318d051a 100644
--- a/lttng-filter-specialize.c
+++ b/lttng-filter-specialize.c
@@ -77,7 +77,13 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 				goto end;
 
 			case REG_STRING:
-				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:
+				insn->op = FILTER_OP_EQ_STAR_GLOB_STRING;
 				break;
 			case REG_S64:
 				if (vstack_bx(stack)->type == REG_S64)
@@ -113,7 +119,13 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 				goto end;
 
 			case REG_STRING:
-				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:
+				insn->op = FILTER_OP_NE_STAR_GLOB_STRING;
 				break;
 			case REG_S64:
 				if (vstack_bx(stack)->type == REG_S64)
@@ -148,6 +160,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 				ret = -EINVAL;
 				goto end;
 
+			case REG_STAR_GLOB_STRING:
+				printk(KERN_WARNING "invalid register type for > binary operator\n");
+				ret = -EINVAL;
+				goto end;
 			case REG_STRING:
 				insn->op = FILTER_OP_GT_STRING;
 				break;
@@ -184,6 +200,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 				ret = -EINVAL;
 				goto end;
 
+			case REG_STAR_GLOB_STRING:
+				printk(KERN_WARNING "invalid register type for < binary operator\n");
+				ret = -EINVAL;
+				goto end;
 			case REG_STRING:
 				insn->op = FILTER_OP_LT_STRING;
 				break;
@@ -220,6 +240,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 				ret = -EINVAL;
 				goto end;
 
+			case REG_STAR_GLOB_STRING:
+				printk(KERN_WARNING "invalid register type for >= binary operator\n");
+				ret = -EINVAL;
+				goto end;
 			case REG_STRING:
 				insn->op = FILTER_OP_GE_STRING;
 				break;
@@ -255,6 +279,10 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 				ret = -EINVAL;
 				goto end;
 
+			case REG_STAR_GLOB_STRING:
+				printk(KERN_WARNING "invalid register type for <= binary operator\n");
+				ret = -EINVAL;
+				goto end;
 			case REG_STRING:
 				insn->op = FILTER_OP_LE_STRING;
 				break;
@@ -282,6 +310,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:
@@ -475,6 +505,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)) {
@@ -511,6 +554,7 @@ int lttng_filter_specialize_bytecode(struct bytecode_runtime *bytecode)
 				goto end;
 
 			case REG_STRING:
+			case REG_STAR_GLOB_STRING:
 				printk(KERN_WARNING "Cast op can only be applied to numeric or floating point registers\n");
 				ret = -EINVAL;
 				goto end;