struct load_op *op;
struct lttng_ust_ctx_field *ctx_field;
int idx;
- struct lttng_ust_ctx **pctx = runtime->p.priv->pctx;
+ struct lttng_ust_ctx **pctx = runtime->p.pctx;
dbg_printf("Apply context reloc: %u %s\n", reloc_offset, context_name);
struct lttng_ust_bytecode_runtime *bc_runtime;
cds_list_for_each_entry(bc_runtime, bytecode_runtime_head, node) {
- if (bc_runtime->priv->bc == bytecode)
+ if (bc_runtime->bc == bytecode)
return 1;
}
return 0;
{
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)
ret = -ENOMEM;
goto alloc_error;
}
- 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->p.type = bytecode->type;
+ runtime->p.bc = bytecode;
+ runtime->p.pctx = ctx;
runtime->len = bytecode->bc.reloc_offset;
/* copy original bytecode */
memcpy(runtime->code, bytecode->bc.data, runtime->len);
goto link_error;
}
- switch (bytecode->type) {
- 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();
- }
-
- runtime->p.priv->link_failed = 0;
+ runtime->p.interpreter_func = lttng_bytecode_interpret;
+ runtime->p.link_failed = 0;
cds_list_add_rcu(&runtime->p.node, insert_loc);
dbg_printf("Linking successful.\n");
return 0;
link_error:
- switch (bytecode->type) {
- 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();
- }
-
- runtime_priv->link_failed = 1;
+ runtime->p.interpreter_func = lttng_bytecode_interpret_error;
+ runtime->p.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_ust_bytecode_runtime *runtime)
-{
- struct lttng_ust_bytecode_node *bc = runtime->priv->bc;
-
- 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_ust_bytecode_runtime *runtime)
+void lttng_bytecode_sync_state(struct lttng_ust_bytecode_runtime *runtime)
{
- struct lttng_ust_bytecode_node *bc = runtime->priv->bc;
+ struct lttng_ust_bytecode_node *bc = runtime->bc;
- if (!bc->enabler->enabled || runtime->priv->link_failed)
- runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
+ if (!bc->enabler->enabled || runtime->link_failed)
+ runtime->interpreter_func = lttng_bytecode_interpret_error;
else
- runtime->interpreter_funcs.capture = lttng_bytecode_capture_interpret;
+ runtime->interpreter_func = lttng_bytecode_interpret;
}
/*
* linked with the instance.
*/
cds_list_for_each_entry(runtime, instance_bytecode_head, node) {
- if (runtime->priv->bc == enabler_bc) {
+ if (runtime->bc == enabler_bc) {
found = 1;
break;
}
*/
cds_list_for_each_entry_reverse(runtime,
instance_bytecode_head, node) {
- if (runtime->priv->bc->bc.seqnum <= enabler_bc->bc.seqnum) {
+ if (runtime->bc->bc.seqnum <= enabler_bc->bc.seqnum) {
/* insert here */
insert_loc = &runtime->node;
goto add_within;
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_ust_event_common *event)
{
- free_filter_runtime(&event->filter_bytecode_runtime_head);
+ free_filter_runtime(&event->priv->filter_bytecode_runtime_head);
}