X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-bytecode.c;h=93cd02ebcad1e6634d65e0bf72961dbc712b73bc;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=bbf8e7e7b036aca0afb41a21dd3590c4eb411e55;hpb=c42416df21bb28b9b19ca509f7242f660c5469b2;p=lttng-ust.git diff --git a/liblttng-ust/lttng-bytecode.c b/liblttng-ust/lttng-bytecode.c index bbf8e7e7..93cd02eb 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 @@ -298,21 +280,21 @@ int apply_context_reloc(struct bytecode_runtime *runtime, struct load_op *op; struct lttng_ctx_field *ctx_field; int idx; - struct lttng_ctx *ctx = *runtime->p.pctx; + struct lttng_ctx **pctx = runtime->p.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 { @@ -324,7 +306,7 @@ int apply_context_reloc(struct bytecode_runtime *runtime, 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) { @@ -421,7 +403,7 @@ int bytecode_is_linked(struct lttng_ust_bytecode_node *bytecode, * bytecode runtime. */ static -int _lttng_filter_link_bytecode(const struct lttng_event_desc *event_desc, +int link_bytecode(const struct lttng_event_desc *event_desc, struct lttng_ctx **ctx, struct lttng_ust_bytecode_node *bytecode, struct cds_list_head *insert_loc) @@ -483,6 +465,9 @@ int _lttng_filter_link_bytecode(const struct lttng_event_desc *event_desc, case LTTNG_UST_BYTECODE_NODE_TYPE_FILTER: runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret; break; + case LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE: + runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret; + break; default: abort(); } @@ -497,6 +482,9 @@ link_error: case LTTNG_UST_BYTECODE_NODE_TYPE_FILTER: runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret_false; break; + case LTTNG_UST_BYTECODE_NODE_TYPE_CAPTURE: + runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret_false; + break; default: abort(); } @@ -518,32 +506,54 @@ 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) +{ + struct lttng_ust_bytecode_node *bc = runtime->bc; + + if (!bc->enabler->enabled || runtime->link_failed) + runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret_false; + else + runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret; +} + /* - * Link all bytecodes of the enabler referenced in the provided bytecode list. + * Given the lists of bytecode programs of an instance (trigger or event) and + * of a matching enabler, try to link all the enabler's bytecode programs with + * the instance. + * + * 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, - struct cds_list_head *bytecode_runtime_head, - struct lttng_enabler *enabler) + struct cds_list_head *instance_bytecode_head, + struct cds_list_head *enabler_bytecode_head) { - struct lttng_ust_bytecode_node *bc; + struct lttng_ust_bytecode_node *enabler_bc; struct lttng_bytecode_runtime *runtime; assert(event_desc); - /* Link each bytecode. */ - cds_list_for_each_entry(bc, &enabler->filter_bytecode_head, node) { + /* Go over all the bytecode programs of the enabler. */ + cds_list_for_each_entry(enabler_bc, enabler_bytecode_head, node) { int found = 0, ret; struct cds_list_head *insert_loc; - cds_list_for_each_entry(runtime, - bytecode_runtime_head, node) { - if (runtime->bc == bc) { + /* + * Check if the current enabler bytecode program is already + * linked with the instance. + */ + cds_list_for_each_entry(runtime, instance_bytecode_head, node) { + if (runtime->bc == enabler_bc) { found = 1; break; } } - /* Skip bytecode already linked */ + + /* + * Skip bytecode already linked, go to the next enabler + * bytecode program. + */ if (found) continue; @@ -553,8 +563,8 @@ void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc, * insert the new bytecode right after it. */ cds_list_for_each_entry_reverse(runtime, - bytecode_runtime_head, node) { - if (runtime->bc->bc.seqnum <= bc->bc.seqnum) { + instance_bytecode_head, node) { + if (runtime->bc->bc.seqnum <= enabler_bc->bc.seqnum) { /* insert here */ insert_loc = &runtime->node; goto add_within; @@ -562,11 +572,10 @@ void lttng_enabler_link_bytecode(const struct lttng_event_desc *event_desc, } /* Add to head to list */ - insert_loc = bytecode_runtime_head; + insert_loc = instance_bytecode_head; add_within: dbg_printf("linking bytecode\n"); - ret = _lttng_filter_link_bytecode(event_desc, ctx, bc, - insert_loc); + ret = link_bytecode(event_desc, ctx, enabler_bc, insert_loc); if (ret) { dbg_printf("[lttng filter] warning: cannot link event bytecode\n"); } @@ -605,8 +614,3 @@ void lttng_free_event_notifier_filter_runtime( { 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) -{ -}