break;
}
/* compute field offset */
- switch (fields[i].type.atype) {
- case atype_integer:
- case atype_enum_nestable:
+ switch (fields[i].type.type) {
+ case lttng_kernel_type_integer:
+ case lttng_kernel_type_enum_nestable:
field_offset += sizeof(int64_t);
break;
- case atype_array_nestable:
+ case lttng_kernel_type_array_nestable:
if (!lttng_is_bytewise_integer(fields[i].type.u.array_nestable.elem_type))
return -EINVAL;
field_offset += sizeof(unsigned long);
field_offset += sizeof(void *);
break;
- case atype_sequence_nestable:
+ case lttng_kernel_type_sequence_nestable:
if (!lttng_is_bytewise_integer(fields[i].type.u.sequence_nestable.elem_type))
return -EINVAL;
field_offset += sizeof(unsigned long);
field_offset += sizeof(void *);
break;
- case atype_string:
+ case lttng_kernel_type_string:
field_offset += sizeof(void *);
break;
- case atype_struct_nestable: /* Unsupported. */
- case atype_variant_nestable: /* Unsupported. */
+ case lttng_kernel_type_struct_nestable: /* Unsupported. */
+ case lttng_kernel_type_variant_nestable: /* Unsupported. */
default:
return -EINVAL;
}
struct field_ref *field_ref;
field_ref = (struct field_ref *) op->data;
- switch (field->type.atype) {
- case atype_integer:
- case atype_enum_nestable:
+ switch (field->type.type) {
+ case lttng_kernel_type_integer:
+ case lttng_kernel_type_enum_nestable:
op->op = BYTECODE_OP_LOAD_FIELD_REF_S64;
break;
- case atype_array_nestable:
- case atype_sequence_nestable:
+ case lttng_kernel_type_array_nestable:
+ {
+ const struct lttng_type *elem_type = field->type.u.array_nestable.elem_type;
+
+ if (!lttng_is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_kernel_string_encoding_none)
+ return -EINVAL;
if (field->user)
op->op = BYTECODE_OP_LOAD_FIELD_REF_USER_SEQUENCE;
else
op->op = BYTECODE_OP_LOAD_FIELD_REF_SEQUENCE;
break;
- case atype_string:
+ }
+ case lttng_kernel_type_sequence_nestable:
+ {
+ const struct lttng_type *elem_type = field->type.u.sequence_nestable.elem_type;
+
+ if (!lttng_is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_kernel_string_encoding_none)
+ return -EINVAL;
+ if (field->user)
+ op->op = BYTECODE_OP_LOAD_FIELD_REF_USER_SEQUENCE;
+ else
+ op->op = BYTECODE_OP_LOAD_FIELD_REF_SEQUENCE;
+ break;
+ }
+ case lttng_kernel_type_string:
if (field->user)
op->op = BYTECODE_OP_LOAD_FIELD_REF_USER_STRING;
else
op->op = BYTECODE_OP_LOAD_FIELD_REF_STRING;
break;
- case atype_struct_nestable: /* Unsupported. */
- case atype_variant_nestable: /* Unsupported. */
+ case lttng_kernel_type_struct_nestable: /* Unsupported. */
+ case lttng_kernel_type_variant_nestable: /* Unsupported. */
default:
return -EINVAL;
}
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_nestable:
+ switch (ctx_field->event_field.type.type) {
+ case lttng_kernel_type_integer:
+ case lttng_kernel_type_enum_nestable:
op->op = BYTECODE_OP_GET_CONTEXT_REF_S64;
break;
/* Sequence and array supported as string */
- case atype_string:
+ case lttng_kernel_type_string:
BUG_ON(ctx_field->event_field.user);
op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
break;
- case atype_array_nestable:
- if (!lttng_is_bytewise_integer(ctx_field->event_field.type.u.array_nestable.elem_type))
+ case lttng_kernel_type_array_nestable:
+ {
+ const struct lttng_type *elem_type = ctx_field->event_field.type.u.array_nestable.elem_type;
+
+ if (!lttng_is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_kernel_string_encoding_none)
return -EINVAL;
BUG_ON(ctx_field->event_field.user);
op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
break;
- case atype_sequence_nestable:
- if (!lttng_is_bytewise_integer(ctx_field->event_field.type.u.sequence_nestable.elem_type))
+ }
+ case lttng_kernel_type_sequence_nestable:
+ {
+ const struct lttng_type *elem_type = ctx_field->event_field.type.u.sequence_nestable.elem_type;
+
+ if (!lttng_is_bytewise_integer(elem_type) || elem_type->u.integer.encoding == lttng_kernel_string_encoding_none)
return -EINVAL;
BUG_ON(ctx_field->event_field.user);
op->op = BYTECODE_OP_GET_CONTEXT_REF_STRING;
break;
- case atype_struct_nestable: /* Unsupported. */
- case atype_variant_nestable: /* Unsupported. */
+ }
+ case lttng_kernel_type_struct_nestable: /* Unsupported. */
+ case lttng_kernel_type_variant_nestable: /* Unsupported. */
default:
return -EINVAL;
}
int link_bytecode(const struct lttng_event_desc *event_desc,
struct lttng_ctx *ctx,
struct lttng_bytecode_node *bytecode,
+ struct list_head *bytecode_runtime_head,
struct list_head *insert_loc)
{
int ret, offset, next_offset;
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_printk("Linking...\n");
case LTTNG_BYTECODE_NODE_TYPE_FILTER:
runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret;
break;
+ case LTTNG_BYTECODE_NODE_TYPE_CAPTURE:
+ runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
+ break;
default:
WARN_ON(1);
}
case LTTNG_BYTECODE_NODE_TYPE_FILTER:
runtime->p.interpreter_funcs.filter = lttng_bytecode_filter_interpret_false;
break;
+ case LTTNG_BYTECODE_NODE_TYPE_CAPTURE:
+ runtime->p.interpreter_funcs.capture = lttng_bytecode_capture_interpret_false;
+ break;
default:
WARN_ON(1);
}
runtime->interpreter_funcs.filter = lttng_bytecode_filter_interpret;
}
+void lttng_bytecode_capture_sync_state(struct lttng_bytecode_runtime *runtime)
+{
+ struct lttng_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;
+}
+
/*
- * 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.
+ * Given the lists of bytecode programs of an instance (event or event
+ * notifier) 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 matching names (or glob pattern matching).
insert_loc = instance_bytecode_head;
add_within:
dbg_printk("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_printk("[lttng filter] warning: cannot link event bytecode\n");
}
kfree(runtime);
}
}
+
+void lttng_free_event_notifier_filter_runtime(struct lttng_event_notifier *event_notifier)
+{
+ struct bytecode_runtime *runtime, *tmp;
+
+ list_for_each_entry_safe(runtime, tmp,
+ &event_notifier->filter_bytecode_runtime_head, p.node) {
+ kfree(runtime->data);
+ kfree(runtime);
+ }
+}