X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Ffilter%2Ffilter-visitor-generate-bytecode.c;h=d0cc49556fc11560b02a8aca54cb736d2ac4291f;hp=7d62757477febbcddd0a88e8f4524d74c74682a9;hb=9f449915b9d44ce3c9c9255f5d491a62545fee25;hpb=3f0c88379cfbbbec84641e13b21f290a563f8729

diff --git a/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c b/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
index 7d6275747..d0cc49556 100644
--- a/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
+++ b/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
@@ -22,7 +22,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "align.h"
+#include <common/align.h>
+#include <common/compat/string.h>
+
 #include "filter-bytecode.h"
 #include "filter-ir.h"
 #include "filter-ast.h"
@@ -33,47 +35,17 @@
 #define max_t(type, a, b)	((type) ((a) > (b) ? (a) : (b)))
 #endif
 
-//#define INIT_ALLOC_SIZE		PAGE_SIZE
 #define INIT_ALLOC_SIZE		4
 
 static
 int recursive_visit_gen_bytecode(struct filter_parser_ctx *ctx,
 		struct ir_op *node);
 
-static inline int fls(unsigned int x)
-{
-	int r = 32;
-
-	if (!x)
-		return 0;
-	if (!(x & 0xFFFF0000U)) {
-		x <<= 16;
-		r -= 16;
-	}
-	if (!(x & 0xFF000000U)) {
-		x <<= 8;
-		r -= 8;
-	}
-	if (!(x & 0xF0000000U)) {
-		x <<= 4;
-		r -= 4;
-	}
-	if (!(x & 0xC0000000U)) {
-		x <<= 2;
-		r -= 2;
-	}
-	if (!(x & 0x80000000U)) {
-		x <<= 1;
-		r -= 1;
-	}
-	return r;
-}
-
 static inline int get_count_order(unsigned int count)
 {
 	int order;
 
-	order = fls(count) - 1;
+	order = lttng_fls(count) - 1;
 	if (count & (count - 1))
 		order++;
 	return order;
@@ -201,13 +173,38 @@ int visit_node_load(struct filter_parser_ctx *ctx, struct ir_op *node)
 	{
 		struct load_op *insn;
 		uint32_t insn_len = sizeof(struct load_op)
-			+ strlen(node->u.load.u.string) + 1;
+			+ strlen(node->u.load.u.string.value) + 1;
 
 		insn = calloc(insn_len, 1);
 		if (!insn)
 			return -ENOMEM;
-		insn->op = FILTER_OP_LOAD_STRING;
-		strcpy(insn->data, node->u.load.u.string);
+
+		switch (node->u.load.u.string.type) {
+		case IR_LOAD_STRING_TYPE_GLOB_STAR:
+			/*
+			 * We explicitly tell the interpreter here that
+			 * this load is a full star globbing pattern so
+			 * that the appropriate matching function can be
+			 * called. Also, see comment below.
+			 */
+			insn->op = FILTER_OP_LOAD_STAR_GLOB_STRING;
+			break;
+		default:
+			/*
+			 * This is the "legacy" string, which includes
+			 * star globbing patterns with a star only at
+			 * the end. Both "plain" and "star at the end"
+			 * literal strings are handled at the same place
+			 * by the tracer's filter bytecode interpreter,
+			 * whereas full star globbing patterns (stars
+			 * can be anywhere in the string) is a special
+			 * case.
+			 */
+			insn->op = FILTER_OP_LOAD_STRING;
+			break;
+		}
+
+		strcpy(insn->data, node->u.load.u.string.value);
 		ret = bytecode_push(&ctx->bytecode, insn, 1, insn_len);
 		free(insn);
 		return ret;
@@ -520,6 +517,10 @@ int recursive_visit_gen_bytecode(struct filter_parser_ctx *ctx,
 LTTNG_HIDDEN
 void filter_bytecode_free(struct filter_parser_ctx *ctx)
 {
+	if (!ctx) {
+		return;
+	}
+
 	if (ctx->bytecode) {
 		free(ctx->bytecode);
 		ctx->bytecode = NULL;