X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-bytecode.c;h=6c86c634fb0a3ceca4ce76cd53a6fca2b1a1f7a5;hb=ddabe860f4cf41a4206a8157d83e6b9354f85cb5;hp=c52c79bb6ee35a3893e33e5b4607baae217b7312;hpb=362a65de6aba2cbc27c61c9fc23e755cb617837f;p=lttng-ust.git diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c index c52c79bb..6c86c634 100644 --- a/liblttng-ust/lttng-bytecode.c +++ b/liblttng-ust/lttng-bytecode.c @@ -15,6 +15,7 @@ #include "context-internal.h" #include "lttng-bytecode.h" #include "ust-events-internal.h" +#include "ust-helper.h" static const char *opnames[] = { [ BYTECODE_OP_UNKNOWN ] = "UNKNOWN", @@ -171,14 +172,14 @@ const char *lttng_bytecode_print_op(enum bytecode_op op) } static -int apply_field_reloc(const struct lttng_event_desc *event_desc, +int apply_field_reloc(const struct lttng_ust_event_desc *event_desc, struct bytecode_runtime *runtime, uint32_t runtime_len, uint32_t reloc_offset, const char *field_name, enum bytecode_op bytecode_op) { - const struct lttng_event_field *fields, *field = NULL; + const struct lttng_ust_event_field **fields, *field = NULL; unsigned int nr_fields, i; struct load_op *op; uint32_t field_offset = 0; @@ -193,23 +194,20 @@ int apply_field_reloc(const struct lttng_event_desc *event_desc, return -EINVAL; nr_fields = event_desc->nr_fields; for (i = 0; i < nr_fields; i++) { - if (fields[i].u.ext.nofilter) { + if (fields[i]->nofilter) { continue; } - if (!strcmp(fields[i].name, field_name)) { - field = &fields[i]; + if (!strcmp(fields[i]->name, field_name)) { + field = fields[i]; break; } /* compute field offset */ - switch (fields[i].type.atype) { + switch (fields[i]->type.atype) { case atype_integer: - case atype_enum: case atype_enum_nestable: field_offset += sizeof(int64_t); break; - case atype_array: case atype_array_nestable: - case atype_sequence: case atype_sequence_nestable: field_offset += sizeof(unsigned long); field_offset += sizeof(void *); @@ -228,7 +226,7 @@ int apply_field_reloc(const struct lttng_event_desc *event_desc, return -EINVAL; /* Check if field offset is too large for 16-bit offset */ - if (field_offset > FILTER_BYTECODE_MAX_LEN - 1) + if (field_offset > LTTNG_UST_ABI_FILTER_BYTECODE_MAX_LEN - 1) return -EINVAL; /* set type */ @@ -242,13 +240,10 @@ int apply_field_reloc(const struct lttng_event_desc *event_desc, field_ref = (struct field_ref *) op->data; switch (field->type.atype) { case atype_integer: - case atype_enum: case atype_enum_nestable: op->op = BYTECODE_OP_LOAD_FIELD_REF_S64; break; - case atype_array: case atype_array_nestable: - case atype_sequence: case atype_sequence_nestable: op->op = BYTECODE_OP_LOAD_FIELD_REF_SEQUENCE; break; @@ -303,7 +298,7 @@ int apply_context_reloc(struct bytecode_runtime *runtime, } } /* Check if idx is too large for 16-bit offset */ - if (idx > FILTER_BYTECODE_MAX_LEN - 1) + if (idx > LTTNG_UST_ABI_FILTER_BYTECODE_MAX_LEN - 1) return -EINVAL; /* Get context return type */ @@ -318,15 +313,12 @@ int apply_context_reloc(struct bytecode_runtime *runtime, field_ref = (struct field_ref *) op->data; switch (ctx_field->event_field.type.atype) { case atype_integer: - case atype_enum: case atype_enum_nestable: op->op = BYTECODE_OP_GET_CONTEXT_REF_S64; break; /* Sequence and array supported as string */ case atype_string: - case atype_array: case atype_array_nestable: - case atype_sequence: case atype_sequence_nestable: op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING; break; @@ -350,7 +342,7 @@ int apply_context_reloc(struct bytecode_runtime *runtime, } static -int apply_reloc(const struct lttng_event_desc *event_desc, +int apply_reloc(const struct lttng_ust_event_desc *event_desc, struct bytecode_runtime *runtime, uint32_t runtime_len, uint32_t reloc_offset, @@ -390,7 +382,7 @@ static int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode, struct cds_list_head *bytecode_runtime_head) { - struct lttng_bytecode_runtime *bc_runtime; + struct lttng_ust_bytecode_runtime *bc_runtime; cds_list_for_each_entry(bc_runtime, bytecode_runtime_head, node) { if (bc_runtime->priv->bc == bytecode) @@ -404,9 +396,10 @@ int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode, * bytecode runtime. */ static -int link_bytecode(const struct lttng_event_desc *event_desc, +int link_bytecode(const struct lttng_ust_event_desc *event_desc, struct lttng_ctx **ctx, struct lttng_ust_bytecode_node *bytecode, + struct cds_list_head *bytecode_runtime_head, struct cds_list_head *insert_loc) { int ret, offset, next_offset; @@ -417,7 +410,7 @@ int link_bytecode(const struct lttng_event_desc *event_desc, if (!bytecode) return 0; /* Bytecode already linked */ - if (bytecode_is_linked(bytecode, insert_loc)) + if (bytecode_is_linked(bytecode, bytecode_runtime_head)) return 0; dbg_printf("Linking...\n"); @@ -437,6 +430,7 @@ int link_bytecode(const struct lttng_event_desc *event_desc, goto alloc_error; } runtime->p.priv = runtime_priv; + runtime->p.struct_size = sizeof(struct lttng_ust_bytecode_runtime); runtime_priv->pub = runtime; runtime_priv->bc = bytecode; runtime_priv->pctx = ctx; @@ -507,7 +501,7 @@ alloc_error: return ret; } -void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime) +void lttng_bytecode_filter_sync_state(struct lttng_ust_bytecode_runtime *runtime) { struct lttng_ust_bytecode_node *bc = runtime->priv->bc; @@ -517,7 +511,7 @@ void lttng_bytecode_filter_sync_state(struct lttng_bytecode_runtime *runtime) runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret; } -void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime) +void lttng_bytecode_capture_sync_state(struct lttng_ust_bytecode_runtime *runtime) { struct lttng_ust_bytecode_node *bc = runtime->priv->bc; @@ -535,13 +529,13 @@ void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime) * This function is called after we confirmed that name enabler and the * instance are name matching (or glob pattern matching). */ -void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc, +void lttng_enabler_link_bytecode(const struct lttng_ust_event_desc *event_desc, struct lttng_ctx **ctx, struct cds_list_head *instance_bytecode_head, struct cds_list_head *enabler_bytecode_head) { struct lttng_ust_bytecode_node *enabler_bc; - struct lttng_bytecode_runtime *runtime; + struct lttng_ust_bytecode_runtime *runtime; assert(event_desc); @@ -586,7 +580,7 @@ void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc, insert_loc = instance_bytecode_head; add_within: dbg_printf("linking bytecode\n"); - ret = link_bytecode(event_desc, ctx, enabler_bc, insert_loc); + ret = link_bytecode(event_desc, ctx, enabler_bc, instance_bytecode_head, insert_loc); if (ret) { dbg_printf("[lttng filter] warning: cannot link event bytecode\n"); } @@ -616,13 +610,7 @@ void free_filter_runtime(struct cds_list_head *bytecode_runtime_head) } } -void lttng_free_event_filter_runtime(struct lttng_event *event) +void lttng_free_event_filter_runtime(struct lttng_ust_event_common *event) { free_filter_runtime(&event->filter_bytecode_runtime_head); } - -void lttng_free_event_notifier_filter_runtime( - struct lttng_event_notifier *event_notifier) -{ - free_filter_runtime(&event_notifier->filter_bytecode_runtime_head); -}