Add support for "full" star globbing patterns in event names and filters

[lttng-tools.git] / src / lib / lttng-ctl / filter / filter-visitor-generate-ir.c

diff --git a/src/lib/lttng-ctl/filter/filter-visitor-generate-ir.c b/src/lib/lttng-ctl/filter/filter-visitor-generate-ir.c
index d694dcc1609d202ab0dd60a0be65795e5fdf03af..e3dc1aab9481467ec4140341255b099b4d71ff76 100644 (file)
--- a/src/lib/lttng-ctl/filter/filter-visitor-generate-ir.c
+++ b/src/lib/lttng-ctl/filter/filter-visitor-generate-ir.c
@@ -31,6 +31,7 @@
 #include "filter-ir.h"
 
 #include <common/macros.h>
+#include <common/string-utils/string-utils.h>
 
 static
 struct ir_op *generate_ir_recursive(struct filter_parser_ctx *ctx,
@@ -68,6 +69,22 @@ struct ir_op *make_op_root(struct ir_op *child, enum ir_side side)
        return op;
 }
 
+static
+enum ir_load_string_type get_literal_string_type(const char *string)
+{
+       assert(string);
+
+       if (strutils_is_star_glob_pattern(string)) {
+               if (strutils_is_star_at_the_end_only_glob_pattern(string)) {
+                       return IR_LOAD_STRING_TYPE_GLOB_STAR_END;
+               }
+
+               return IR_LOAD_STRING_TYPE_GLOB_STAR;
+       }
+
+       return IR_LOAD_STRING_TYPE_PLAIN;
+}
+
 static
 struct ir_op *make_op_load_string(char *string, enum ir_side side)
 {
@@ -80,8 +97,9 @@ struct ir_op *make_op_load_string(char *string, enum ir_side side)
        op->data_type = IR_DATA_STRING;
        op->signedness = IR_SIGN_UNKNOWN;
        op->side = side;
-       op->u.load.u.string = strdup(string);
-       if (!op->u.load.u.string) {
+       op->u.load.u.string.type = get_literal_string_type(string);
+       op->u.load.u.string.value = strdup(string);
+       if (!op->u.load.u.string.value) {
                free(op);
                return NULL;
        }
@@ -366,7 +384,7 @@ void filter_free_ir_recursive(struct ir_op *op)
        case IR_OP_LOAD:
                switch (op->data_type) {
                case IR_DATA_STRING:
-                       free(op->u.load.u.string);
+                       free(op->u.load.u.string.value);
                        break;
                case IR_DATA_FIELD_REF:         /* fall-through */
                case IR_DATA_GET_CONTEXT_REF:
@@ -418,36 +436,30 @@ struct ir_op *make_expression(struct filter_parser_ctx *ctx,
                                        side);
        case AST_EXP_GLOBAL_IDENTIFIER:
        {
-               struct filter_node *next;
+               const char *name;
 
-               if (node->u.expression.pre_op == AST_LINK_UNKNOWN) {
-                       fprintf(stderr, "[error] %s: global identifiers need chained identifier \n", __func__);
-                       return NULL;
-               }
-               /* We currently only support $ctx (context) identifiers */
+               /*
+                * We currently only support $ctx (context) and $app
+                * identifiers.
+                */
                if (strncmp(node->u.expression.u.identifier,
-                               "$ctx", strlen("$ctx")) != 0) {
-                       fprintf(stderr, "[error] %s: \"%s\" global identifier is unknown. Only \"$ctx\" currently implemented.\n", __func__, node->u.expression.u.identifier);
+                               "$ctx.", strlen("$ctx.")) != 0
+                       && strncmp(node->u.expression.u.identifier,
+                               "$app.", strlen("$app.")) != 0) {
+                       fprintf(stderr, "[error] %s: \"%s\" global identifier is unknown. Only \"$ctx\" and \"$app\" are currently implemented.\n", __func__, node->u.expression.u.identifier);
                        return NULL;
                }
-               next = node->u.expression.next;
-               if (!next) {
-                       fprintf(stderr, "[error] %s: Expecting a context name, e.g. \'$ctx.name\'.\n", __func__);
+               name = strchr(node->u.expression.u.identifier, '.');
+               if (!name) {
+                       fprintf(stderr, "[error] %s: Expecting '.'\n", __func__);
                        return NULL;
                }
-               if (next->type != NODE_EXPRESSION) {
-                       fprintf(stderr, "[error] %s: Expecting expression.\n", __func__);
-                       return NULL;
-               }
-               if (next->u.expression.type != AST_EXP_IDENTIFIER) {
-                       fprintf(stderr, "[error] %s: Expecting identifier.\n", __func__);
-                       return NULL;
-               }
-               if (next->u.expression.pre_op != AST_LINK_UNKNOWN) {
-                       fprintf(stderr, "[error] %s: dotted and dereferenced identifiers not supported after identifier\n", __func__);
+               name++; /* Skip . */
+               if (!strlen(name)) {
+                       fprintf(stderr, "[error] %s: Expecting a context name, e.g. \'$ctx.name\'.\n", __func__);
                        return NULL;
                }
-               return make_op_load_get_context_ref(next->u.expression.u.identifier,
+               return make_op_load_get_context_ref(node->u.expression.u.identifier,
                                        side);
        }
        case AST_EXP_NESTED: