#include "context-internal.h"
#include "lttng-bytecode.h"
#include "ust-events-internal.h"
+#include "ust-helper.h"
static int lttng_fls(int val)
{
case OBJECT_TYPE_ARRAY:
{
const struct lttng_integer_type *integer_type;
- const struct lttng_event_field *field;
+ const struct lttng_ust_event_field *field;
uint32_t elem_len, num_elems;
int signedness;
case OBJECT_TYPE_SEQUENCE:
{
const struct lttng_integer_type *integer_type;
- const struct lttng_event_field *field;
+ const struct lttng_ust_event_field *field;
uint32_t elem_len;
int signedness;
return ret;
}
-static int specialize_context_lookup_name(struct lttng_ctx *ctx,
+static int specialize_context_lookup_name(struct lttng_ust_ctx *ctx,
struct bytecode_runtime *bytecode,
struct load_op *insn)
{
return lttng_get_context_index(ctx, name);
}
-static int specialize_load_object(const struct lttng_event_field *field,
+static int specialize_load_object(const struct lttng_ust_event_field *field,
struct vstack_load *load, bool is_context)
{
load->type = LOAD_OBJECT;
return 0;
}
-static int specialize_context_lookup(struct lttng_ctx *ctx,
+static int specialize_context_lookup(struct lttng_ust_ctx *ctx,
struct bytecode_runtime *runtime,
struct load_op *insn,
struct vstack_load *load)
{
int idx, ret;
- struct lttng_ctx_field *ctx_field;
- struct lttng_event_field *field;
+ struct lttng_ust_ctx_field *ctx_field;
+ struct lttng_ust_event_field *field;
struct bytecode_get_index_data gid;
ssize_t data_offset;
if (idx < 0) {
return -ENOENT;
}
- ctx_field = &ctx->fields[idx];
- field = &ctx_field->event_field;
+ ctx_field = ctx->fields[idx];
+ field = ctx_field->event_field;
ret = specialize_load_object(field, load, true);
if (ret)
return ret;
return 0;
}
-static int specialize_app_context_lookup(struct lttng_ctx **pctx,
+static int specialize_app_context_lookup(struct lttng_ust_ctx **pctx,
struct bytecode_runtime *runtime,
struct load_op *insn,
struct vstack_load *load)
const char *orig_name;
char *name = NULL;
int idx, ret;
- struct lttng_ctx_field *ctx_field;
- struct lttng_event_field *field;
+ struct lttng_ust_ctx_field *ctx_field;
+ struct lttng_ust_event_field *field;
struct bytecode_get_index_data gid;
ssize_t data_offset;
if (idx < 0)
return -ENOENT;
}
- ctx_field = &(*pctx)->fields[idx];
- field = &ctx_field->event_field;
+ ctx_field = (*pctx)->fields[idx];
+ field = ctx_field->event_field;
ret = specialize_load_object(field, load, true);
if (ret)
goto end;
return ret;
}
-static int specialize_payload_lookup(const struct lttng_event_desc *event_desc,
+static int specialize_payload_lookup(const struct lttng_ust_event_desc *event_desc,
struct bytecode_runtime *runtime,
struct load_op *insn,
struct vstack_load *load)
unsigned int i, nr_fields;
bool found = false;
uint32_t field_offset = 0;
- const struct lttng_event_field *field;
+ const struct lttng_ust_event_field *field;
int ret;
struct bytecode_get_index_data gid;
ssize_t data_offset;
offset = ((struct get_symbol *) insn->data)->offset;
name = runtime->p.priv->bc->bc.data + runtime->p.priv->bc->bc.reloc_offset + offset;
for (i = 0; i < nr_fields; i++) {
- field = &event_desc->fields[i];
- if (field->u.ext.nofilter) {
+ field = event_desc->fields[i];
+ if (field->nofilter) {
continue;
}
if (!strcmp(field->name, name)) {
return ret;
}
-int lttng_bytecode_specialize(const struct lttng_event_desc *event_desc,
+int lttng_bytecode_specialize(const struct lttng_ust_event_desc *event_desc,
struct bytecode_runtime *bytecode)
{
void *pc, *next_pc, *start_pc;
int ret = -EINVAL;
struct vstack _stack;
struct vstack *stack = &_stack;
- struct lttng_ctx **pctx = bytecode->p.priv->pctx;
+ struct lttng_ust_ctx **pctx = bytecode->p.priv->pctx;
vstack_init(stack);