Namespace private ABI lttng_transport_find symbol

[lttng-ust.git] / liblttng-ust / lttng-bytecode-specialize.c

diff --git a/liblttng-ust/lttng-bytecode-specialize.c b/liblttng-ust/lttng-bytecode-specialize.c
index ee65ff3be259b59bf1da7b1c7e3359700ec981ed..1ba4ffebdd1cbc303205faeb73ad1bfabd196a9d 100644 (file)
--- a/liblttng-ust/lttng-bytecode-specialize.c
+++ b/liblttng-ust/lttng-bytecode-specialize.c
@@ -15,6 +15,7 @@
 #include "context-internal.h"
 #include "lttng-bytecode.h"
 #include "ust-events-internal.h"
+#include "ust-helper.h"
 
 static int lttng_fls(int val)
 {
@@ -253,16 +254,12 @@ static int specialize_get_index(struct bytecode_runtime *runtime,
                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;
 
                        field = stack_top->load.field;
                        switch (field->type.atype) {
-                       case atype_array:
-                               integer_type = &field->type.u.legacy.array.elem_type.u.basic.integer;
-                               num_elems = field->type.u.legacy.array.length;
-                               break;
                        case atype_array_nestable:
                                if (field->type.u.array_nestable.elem_type->atype != atype_integer) {
                                        ret = -EINVAL;
@@ -297,15 +294,12 @@ static int specialize_get_index(struct bytecode_runtime *runtime,
                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;
 
                        field = stack_top->load.field;
                        switch (field->type.atype) {
-                       case atype_sequence:
-                               integer_type = &field->type.u.legacy.sequence.elem_type.u.basic.integer;
-                               break;
                        case atype_sequence_nestable:
                                if (field->type.u.sequence_nestable.elem_type->atype != atype_integer) {
                                        ret = -EINVAL;
@@ -384,7 +378,7 @@ static int specialize_context_lookup_name(struct lttng_ctx *ctx,
        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;
@@ -397,16 +391,11 @@ static int specialize_load_object(const struct lttng_event_field *field,
                        load->object_type = OBJECT_TYPE_U64;
                load->rev_bo = false;
                break;
-       case atype_enum:
        case atype_enum_nestable:
        {
                const struct lttng_integer_type *itype;
 
-               if (field->type.atype == atype_enum) {
-                       itype = &field->type.u.legacy.basic.enumeration.container_type;
-               } else {
-                       itype = &field->type.u.enum_nestable.container_type->u.integer;
-               }
+               itype = &field->type.u.enum_nestable.container_type->u.integer;
                if (itype->signedness)
                        load->object_type = OBJECT_TYPE_SIGNED_ENUM;
                else
@@ -414,22 +403,6 @@ static int specialize_load_object(const struct lttng_event_field *field,
                load->rev_bo = false;
                break;
        }
-       case atype_array:
-               if (field->type.u.legacy.array.elem_type.atype != atype_integer) {
-                       ERR("Array nesting only supports integer types.");
-                       return -EINVAL;
-               }
-               if (is_context) {
-                       load->object_type = OBJECT_TYPE_STRING;
-               } else {
-                       if (field->type.u.legacy.array.elem_type.u.basic.integer.encoding == lttng_encode_none) {
-                               load->object_type = OBJECT_TYPE_ARRAY;
-                               load->field = field;
-                       } else {
-                               load->object_type = OBJECT_TYPE_STRING_SEQUENCE;
-                       }
-               }
-               break;
        case atype_array_nestable:
                if (field->type.u.array_nestable.elem_type->atype != atype_integer) {
                        ERR("Array nesting only supports integer types.");
@@ -446,22 +419,6 @@ static int specialize_load_object(const struct lttng_event_field *field,
                        }
                }
                break;
-       case atype_sequence:
-               if (field->type.u.legacy.sequence.elem_type.atype != atype_integer) {
-                       ERR("Sequence nesting only supports integer types.");
-                       return -EINVAL;
-               }
-               if (is_context) {
-                       load->object_type = OBJECT_TYPE_STRING;
-               } else {
-                       if (field->type.u.legacy.sequence.elem_type.u.basic.integer.encoding == lttng_encode_none) {
-                               load->object_type = OBJECT_TYPE_SEQUENCE;
-                               load->field = field;
-                       } else {
-                               load->object_type = OBJECT_TYPE_STRING_SEQUENCE;
-                       }
-               }
-               break;
        case atype_sequence_nestable:
                if (field->type.u.sequence_nestable.elem_type->atype != atype_integer) {
                        ERR("Sequence nesting only supports integer types.");
@@ -488,9 +445,6 @@ static int specialize_load_object(const struct lttng_event_field *field,
        case atype_dynamic:
                load->object_type = OBJECT_TYPE_DYNAMIC;
                break;
-       case atype_struct:
-               ERR("Structure type cannot be loaded.");
-               return -EINVAL;
        default:
                ERR("Unknown type: %d", (int) field->type.atype);
                return -EINVAL;
@@ -505,7 +459,7 @@ static int specialize_context_lookup(struct lttng_ctx *ctx,
 {
        int idx, ret;
        struct lttng_ctx_field *ctx_field;
-       struct lttng_event_field *field;
+       struct lttng_ust_event_field *field;
        struct bytecode_get_index_data gid;
        ssize_t data_offset;
 
@@ -544,7 +498,7 @@ static int specialize_app_context_lookup(struct lttng_ctx **pctx,
        char *name = NULL;
        int idx, ret;
        struct lttng_ctx_field *ctx_field;
-       struct lttng_event_field *field;
+       struct lttng_ust_event_field *field;
        struct bytecode_get_index_data gid;
        ssize_t data_offset;
 
@@ -593,7 +547,7 @@ 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)
@@ -603,7 +557,7 @@ static int specialize_payload_lookup(const struct lttng_event_desc *event_desc,
        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;
@@ -612,8 +566,8 @@ static int specialize_payload_lookup(const struct lttng_event_desc *event_desc,
        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)) {
@@ -623,13 +577,10 @@ static int specialize_payload_lookup(const struct lttng_event_desc *event_desc,
                /* compute field offset on stack */
                switch (field->type.atype) {
                case atype_integer:
-               case atype_enum:
                case atype_enum_nestable:
                        field_offset += sizeof(int64_t);
                        break;
-               case atype_array:
                case atype_array_nestable:
-               case atype_sequence:
                case atype_sequence_nestable:
                        field_offset += sizeof(unsigned long);
                        field_offset += sizeof(void *);
@@ -673,7 +624,7 @@ end:
        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;