X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Ffilter%2Ffilter-visitor-generate-ir.c;h=e3dc1aab9481467ec4140341255b099b4d71ff76;hb=343af227102f6b274bfd7f6c7220eb3b776ba5e3;hp=1458cc72857dc2eb4378603d0fe6c180e4108537;hpb=586dc72f727912b4aa381789c418e062bce89d08;p=lttng-tools.git 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 1458cc728..e3dc1aab9 100644 --- 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 +#include 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; } @@ -213,135 +231,6 @@ struct ir_op *make_op_unary_not(struct ir_op *child, enum ir_side side) child, side); } -#if 0 -static -struct ir_op *make_op_binary_numeric(enum op_type bin_op_type, - const char *op_str, struct ir_op *left, struct ir_op *right, - enum ir_side side) -{ - struct ir_op *op = NULL; - - if (right->data_type == IR_DATA_STRING - || right->data_type == IR_DATA_STRING) { - fprintf(stderr, "[error] binary operation '%s' not allowed on string literal\n", op_str); - goto error; - } - if (left->data_type == IR_DATA_UNKNOWN - || right->data_type == IR_DATA_UNKNOWN) { - fprintf(stderr, "[error] binary operation '%s' has unknown type for both children\n", op_str); - goto error; - - } - - op = calloc(sizeof(struct ir_op_binary), 1); - if (!op) - return NULL; - op->op = IR_OP_BINARY; - op->u.binary.type = bin_op_type; - op->u.binary.left = left; - op->u.binary.right = right; - op->side = side; - - /* - * The field that is not a field ref will select type. - */ - if (left->data_type != IR_DATA_FIELD_REF - && left->data_type != IR_DATA_GET_CONTEXT_REF) - op->data_type = left->data_type; - else - op->data_type = right->data_type; - - if (left->signedness == IR_SIGNED - || right->signedness == IR_SIGNED) { - op->signedness = IR_SIGNED; - } else if (left->signedness == IR_SIGN_DYN - || right->signedness == IR_SIGN_DYN) { - op->signedness = IR_SIGN_DYN; - } else if (left->signedness == IR_UNSIGNED - && right->signedness == IR_UNSIGNED) { - op->signedness = IR_UNSIGNED; - } else { - op->signedness = IR_SIGN_UNKNOWN; - } - - return op; - -error: - free(op); - return NULL; -} - -static -struct ir_op *make_op_binary_mul(struct ir_op *left, struct ir_op *right, - enum ir_side side) -{ - return make_op_binary_numeric(AST_OP_MUL, "*", left, right, side); -} - -static -struct ir_op *make_op_binary_div(struct ir_op *left, struct ir_op *right, - enum ir_side side) -{ - return make_op_binary_numeric(AST_OP_DIV, "/", left, right, side); -} - -static -struct ir_op *make_op_binary_mod(struct ir_op *left, struct ir_op *right, - enum ir_side side) -{ - return make_op_binary_numeric(AST_OP_MOD, "%", left, right, side); -} - -static -struct ir_op *make_op_binary_plus(struct ir_op *left, struct ir_op *right, - enum ir_side side) -{ - return make_op_binary_numeric(AST_OP_PLUS, "+", left, right, side); -} - -static -struct ir_op *make_op_binary_minus(struct ir_op *left, struct ir_op *right, - enum ir_side side) -{ - return make_op_binary_numeric(AST_OP_MINUS, "-", left, right, side); -} - -static -struct ir_op *make_op_binary_rshift(struct ir_op *left, struct ir_op *right, - enum ir_side side) -{ - return make_op_binary_numeric(AST_OP_RSHIFT, ">>", left, right, side); -} - -static -struct ir_op *make_op_binary_lshift(struct ir_op *left, struct ir_op *right, - enum ir_side side) -{ - return make_op_binary_numeric(AST_OP_LSHIFT, "<<", left, right, side); -} - -static -struct ir_op *make_op_binary_and(struct ir_op *left, struct ir_op *right, - enum ir_side side) -{ - return make_op_binary_numeric(AST_OP_BIN_AND, "&", left, right, side); -} - -static -struct ir_op *make_op_binary_or(struct ir_op *left, struct ir_op *right, - enum ir_side side) -{ - return make_op_binary_numeric(AST_OP_BIN_OR, "|", left, right, side); -} - -static -struct ir_op *make_op_binary_xor(struct ir_op *left, struct ir_op *right, - enum ir_side side) -{ - return make_op_binary_numeric(AST_OP_BIN_XOR, "^", left, right, side); -} -#endif //0 - static struct ir_op *make_op_binary_compare(enum op_type bin_op_type, const char *op_str, struct ir_op *left, struct ir_op *right, @@ -495,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: @@ -547,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__); - return NULL; - } - if (next->type != NODE_EXPRESSION) { - fprintf(stderr, "[error] %s: Expecting expression.\n", __func__); + name = strchr(node->u.expression.u.identifier, '.'); + if (!name) { + fprintf(stderr, "[error] %s: Expecting '.'\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: