struct lttng_kernel_ctx_field *ctx_field;
const struct lttng_kernel_event_field *field;
- union lttng_ctx_value v;
+ struct lttng_ctx_value v;
ctx_field = <tng_static_ctx->fields[idx];
field = ctx_field->event_field;
switch (field->type->type) {
case lttng_kernel_type_integer:
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
if (lttng_kernel_get_type_integer(field->type)->signedness) {
ptr->object_type = OBJECT_TYPE_S64;
- ptr->u.s64 = v.s64;
+ ptr->u.s64 = v.u.s64;
ptr->ptr = &ptr->u.s64;
} else {
ptr->object_type = OBJECT_TYPE_U64;
- ptr->u.u64 = v.s64; /* Cast. */
+ ptr->u.u64 = v.u.s64; /* Cast. */
ptr->ptr = &ptr->u.u64;
}
break;
const struct lttng_kernel_type_enum *enum_type = lttng_kernel_get_type_enum(field->type);
const struct lttng_kernel_type_integer *integer_type = lttng_kernel_get_type_integer(enum_type->container_type);
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
if (integer_type->signedness) {
ptr->object_type = OBJECT_TYPE_SIGNED_ENUM;
- ptr->u.s64 = v.s64;
+ ptr->u.s64 = v.u.s64;
ptr->ptr = &ptr->u.s64;
} else {
ptr->object_type = OBJECT_TYPE_UNSIGNED_ENUM;
- ptr->u.u64 = v.s64; /* Cast. */
+ ptr->u.u64 = v.u.s64; /* Cast. */
ptr->ptr = &ptr->u.u64;
}
break;
return -EINVAL;
}
ptr->object_type = OBJECT_TYPE_STRING;
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
- ptr->ptr = v.str;
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
+ ptr->ptr = v.u.str;
break;
}
case lttng_kernel_type_sequence:
return -EINVAL;
}
ptr->object_type = OBJECT_TYPE_STRING;
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
- ptr->ptr = v.str;
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
+ ptr->ptr = v.u.str;
break;
}
case lttng_kernel_type_string:
ptr->object_type = OBJECT_TYPE_STRING;
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
- ptr->ptr = v.str;
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
+ ptr->ptr = v.u.str;
break;
case lttng_kernel_type_struct:
printk(KERN_WARNING "LTTng: bytecode: Structure type cannot be loaded.\n");
struct load_op *insn = (struct load_op *) pc;
struct field_ref *ref = (struct field_ref *) insn->data;
struct lttng_kernel_ctx_field *ctx_field;
- union lttng_ctx_value v;
+ struct lttng_ctx_value v;
dbg_printk("get context ref offset %u type string\n",
ref->offset);
ctx_field = <tng_static_ctx->fields[ref->offset];
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
estack_push(stack, top, ax, bx, ax_t, bx_t);
- estack_ax(stack, top)->u.s.str = v.str;
+ estack_ax(stack, top)->u.s.str = v.u.str;
if (unlikely(!estack_ax(stack, top)->u.s.str)) {
dbg_printk("Bytecode warning: loading a NULL string.\n");
ret = -EINVAL;
struct load_op *insn = (struct load_op *) pc;
struct field_ref *ref = (struct field_ref *) insn->data;
struct lttng_kernel_ctx_field *ctx_field;
- union lttng_ctx_value v;
+ struct lttng_ctx_value v;
dbg_printk("get context ref offset %u type s64\n",
ref->offset);
ctx_field = <tng_static_ctx->fields[ref->offset];
- ctx_field->get_value(ctx_field, lttng_probe_ctx, &v);
+ ctx_field->get_value(ctx_field->priv, lttng_probe_ctx, &v);
estack_push(stack, top, ax, bx, ax_t, bx_t);
- estack_ax_v = v.s64;
+ estack_ax_v = v.u.s64;
estack_ax_t = REG_S64;
dbg_printk("ref get context s64 %lld\n",
(long long) estack_ax_v);