X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-bytecode.c;h=d75600baee9a92e83e68cdae30a981bfd8c416f0;hb=a084756d092167324ee09d3f819cc45407b58233;hp=30d3cbd105d2eb029f83482ab1f013ade312c496;hpb=d37ecb3fc622dee6f80f84c21f38d32eef407262;p=lttng-ust.git diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c index 30d3cbd1..d75600ba 100644 --- a/liblttng-ust/lttng-bytecode.c +++ b/liblttng-ust/lttng-bytecode.c @@ -1,27 +1,9 @@ /* - * lttng-bytecode.c - * - * LTTng UST bytecode code. + * SPDX-License-Identifier: MIT * * Copyright (C) 2010-2016 Mathieu Desnoyers * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * LTTng UST bytecode code. */ #define _LGPL_SOURCE @@ -30,8 +12,10 @@ #include +#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", @@ -179,7 +163,7 @@ static const char *opnames[] = { [ BYTECODE_OP_RETURN_S64 ] = "RETURN_S64", }; -const char *print_op(enum bytecode_op op) +const char *lttng_bytecode_print_op(enum bytecode_op op) { if (op >= NR_BYTECODE_OPS) return "UNKNOWN"; @@ -188,14 +172,14 @@ const char *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; + struct lttng_ust_event_field **fields, *field = NULL; unsigned int nr_fields, i; struct load_op *op; uint32_t field_offset = 0; @@ -210,31 +194,28 @@ 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) { - case atype_integer: - case atype_enum: - case atype_enum_nestable: + switch (fields[i]->type->type) { + case lttng_ust_type_integer: + case lttng_ust_type_enum: field_offset += sizeof(int64_t); break; - case atype_array: - case atype_array_nestable: - case atype_sequence: - case atype_sequence_nestable: + case lttng_ust_type_array: + case lttng_ust_type_sequence: field_offset += sizeof(unsigned long); field_offset += sizeof(void *); break; - case atype_string: + case lttng_ust_type_string: field_offset += sizeof(void *); break; - case atype_float: + case lttng_ust_type_float: field_offset += sizeof(double); break; default: @@ -245,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 */ @@ -257,22 +238,19 @@ int apply_field_reloc(const struct lttng_event_desc *event_desc, struct field_ref *field_ref; field_ref = (struct field_ref *) op->data; - switch (field->type.atype) { - case atype_integer: - case atype_enum: - case atype_enum_nestable: + switch (field->type->type) { + case lttng_ust_type_integer: + case lttng_ust_type_enum: op->op = BYTECODE_OP_LOAD_FIELD_REF_S64; break; - case atype_array: - case atype_array_nestable: - case atype_sequence: - case atype_sequence_nestable: + case lttng_ust_type_array: + case lttng_ust_type_sequence: op->op = BYTECODE_OP_LOAD_FIELD_REF_SEQUENCE; break; - case atype_string: + case lttng_ust_type_string: op->op = BYTECODE_OP_LOAD_FIELD_REF_STRING; break; - case atype_float: + case lttng_ust_type_float: op->op = BYTECODE_OP_LOAD_FIELD_REF_DOUBLE; break; default: @@ -296,23 +274,23 @@ int apply_context_reloc(struct bytecode_runtime *runtime, enum bytecode_op bytecode_op) { struct load_op *op; - struct lttng_ctx_field *ctx_field; + struct lttng_ust_ctx_field *ctx_field; int idx; - struct lttng_ctx *ctx = *runtime->p.pctx; + struct lttng_ust_ctx **pctx = runtime->p.priv->pctx; dbg_printf("Apply context reloc: %u %s\n", reloc_offset, context_name); /* Get context index */ - idx = lttng_get_context_index(ctx, context_name); + idx = lttng_get_context_index(*pctx, context_name); if (idx < 0) { if (lttng_context_is_app(context_name)) { int ret; ret = lttng_ust_add_app_context_to_ctx_rcu(context_name, - &ctx); + pctx); if (ret) return ret; - idx = lttng_get_context_index(ctx, context_name); + idx = lttng_get_context_index(*pctx, context_name); if (idx < 0) return -ENOENT; } else { @@ -320,11 +298,11 @@ 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 */ - ctx_field = &ctx->fields[idx]; + ctx_field = (*pctx)->fields[idx]; op = (struct load_op *) &runtime->code[reloc_offset]; switch (bytecode_op) { @@ -333,24 +311,21 @@ int apply_context_reloc(struct bytecode_runtime *runtime, struct field_ref *field_ref; field_ref = (struct field_ref *) op->data; - switch (ctx_field->event_field.type.atype) { - case atype_integer: - case atype_enum: - case atype_enum_nestable: + switch (ctx_field->event_field->type->type) { + case lttng_ust_type_integer: + case lttng_ust_type_enum: 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: + case lttng_ust_type_string: + case lttng_ust_type_array: + case lttng_ust_type_sequence: op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING; break; - case atype_float: + case lttng_ust_type_float: op->op = BYTECODE_OP_GET_CONTEXT_REF_DOUBLE; break; - case atype_dynamic: + case lttng_ust_type_dynamic: op->op = BYTECODE_OP_GET_CONTEXT_REF; break; default: @@ -367,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, @@ -407,10 +382,10 @@ 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->bc == bytecode) + if (bc_runtime->priv->bc == bytecode) return 1; } return 0; @@ -421,19 +396,21 @@ int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode, * bytecode runtime. */ static -int link_bytecode(const struct lttng_event_desc *event_desc, - struct lttng_ctx **ctx, +int link_bytecode(struct lttng_ust_event_desc *event_desc, + struct lttng_ust_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; struct bytecode_runtime *runtime = NULL; + struct lttng_ust_bytecode_runtime_private *runtime_priv = NULL; size_t runtime_alloc_len; 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"); @@ -445,8 +422,18 @@ int link_bytecode(const struct lttng_event_desc *event_desc, ret = -ENOMEM; goto alloc_error; } - runtime->p.bc = bytecode; - runtime->p.pctx = ctx; + runtime_priv = zmalloc(sizeof(struct lttng_ust_bytecode_runtime_private)); + if (!runtime_priv) { + free(runtime); + runtime = NULL; + ret = -ENOMEM; + 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; runtime->len = bytecode->bc.reloc_offset; /* copy original bytecode */ memcpy(runtime->code, bytecode->bc.data, runtime->len); @@ -490,7 +477,7 @@ int link_bytecode(const struct lttng_event_desc *event_desc, abort(); } - runtime->p.link_failed = 0; + runtime->p.priv->link_failed = 0; cds_list_add_rcu(&runtime->p.node, insert_loc); dbg_printf("Linking successful.\n"); return 0; @@ -507,28 +494,28 @@ link_error: abort(); } - runtime->p.link_failed = 1; + runtime_priv->link_failed = 1; cds_list_add_rcu(&runtime->p.node, insert_loc); alloc_error: dbg_printf("Linking failed.\n"); 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->bc; + struct lttng_ust_bytecode_node *bc = runtime->priv->bc; - if (!bc->enabler->enabled || runtime->link_failed) + if (!bc->enabler->enabled || runtime->priv->link_failed) runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret_false; else 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->bc; + struct lttng_ust_bytecode_node *bc = runtime->priv->bc; - if (!bc->enabler->enabled || runtime->link_failed) + if (!bc->enabler->enabled || runtime->priv->link_failed) runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret_false; else runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret; @@ -542,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, - struct lttng_ctx **ctx, +void lttng_enabler_link_bytecode(struct lttng_ust_event_desc *event_desc, + struct lttng_ust_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); @@ -562,7 +549,7 @@ void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc, * linked with the instance. */ cds_list_for_each_entry(runtime, instance_bytecode_head, node) { - if (runtime->bc == enabler_bc) { + if (runtime->priv->bc == enabler_bc) { found = 1; break; } @@ -582,7 +569,7 @@ void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc, */ cds_list_for_each_entry_reverse(runtime, instance_bytecode_head, node) { - if (runtime->bc->bc.seqnum <= enabler_bc->bc.seqnum) { + if (runtime->priv->bc->bc.seqnum <= enabler_bc->bc.seqnum) { /* insert here */ insert_loc = &runtime->node; goto add_within; @@ -593,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"); } @@ -618,22 +605,12 @@ void free_filter_runtime(struct cds_list_head *bytecode_runtime_head) cds_list_for_each_entry_safe(runtime, tmp, bytecode_runtime_head, p.node) { free(runtime->data); + free(runtime->p.priv); free(runtime); } } -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); -} - -/* For backward compatibility. Leave those exported symbols in place. */ -void lttng_filter_sync_state(struct lttng_bytecode_runtime *runtime) -{ -}