projects / libside.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Enforce ABI size checks
[libside.git] / src / tracer.c
diff --git a/src/tracer.c b/src/tracer.c
index c668e4aff42dc86d6ea66af472c5aa68db847f3a..33c699093b83858617d6bb5cea80ad352dd0f194 100644 (file)
--- a/src/tracer.c
+++ b/src/tracer.c
@@ -186,7 +186,7 @@ int64_t get_attr_integer_value(const struct side_attr *attr)
 {
        int64_t val;
 
-       switch (attr->value.type) {
+       switch (side_enum_get(attr->value.type)) {
        case SIDE_ATTR_TYPE_U8:
                val = attr->value.u.integer_value.side_u8;
                break;
@@ -230,7 +230,7 @@ enum tracer_display_base get_attr_display_base(const struct side_attr *_attr, ui
                bool cmp;
 
                tracer_convert_string_to_utf8(side_ptr_get(attr->key.p), attr->key.unit_size,
-                       attr->key.byte_order, NULL, &utf8_str);
+                       side_enum_get(attr->key.byte_order), NULL, &utf8_str);
                cmp = strcmp(utf8_str, "std.integer.base");
                if (utf8_str != side_ptr_get(attr->key.p))
                        free(utf8_str);
@@ -261,11 +261,11 @@ void tracer_print_attr_type(const char *separator, const struct side_attr *attr)
        char *utf8_str = NULL;
 
        tracer_convert_string_to_utf8(side_ptr_get(attr->key.p), attr->key.unit_size,
-               attr->key.byte_order, NULL, &utf8_str);
+               side_enum_get(attr->key.byte_order), NULL, &utf8_str);
        printf("{ key%s \"%s\", value%s ", separator, utf8_str, separator);
        if (utf8_str != side_ptr_get(attr->key.p))
                free(utf8_str);
-       switch (attr->value.type) {
+       switch (side_enum_get(attr->value.type)) {
        case SIDE_ATTR_TYPE_BOOL:
                printf("%s", attr->value.u.bool_value ? "true" : "false");
                break;
@@ -328,7 +328,7 @@ void tracer_print_attr_type(const char *separator, const struct side_attr *attr)
        case SIDE_ATTR_TYPE_STRING:
                tracer_print_string(side_ptr_get(attr->value.u.string_value.p),
                                attr->value.u.string_value.unit_size,
-                               attr->value.u.string_value.byte_order, NULL);
+                               side_enum_get(attr->value.u.string_value.byte_order), NULL);
                break;
        default:
                fprintf(stderr, "ERROR: <UNKNOWN ATTRIBUTE TYPE>");
@@ -368,7 +368,7 @@ union int64_value tracer_load_integer_value(const struct side_type_integer *type
                len_bits = type_integer->len_bits;
        if (len_bits + offset_bits > type_integer->integer_size * CHAR_BIT)
                abort();
-       reverse_bo = type_integer->byte_order != SIDE_TYPE_BYTE_ORDER_HOST;
+       reverse_bo = side_enum_get(type_integer->byte_order) != SIDE_TYPE_BYTE_ORDER_HOST;
        switch (type_integer->integer_size) {
        case 1:
                if (type_integer->signedness)
@@ -460,7 +460,8 @@ void print_enum_labels(const struct side_enum_mappings *mappings, union int64_va
                }
                if (v64.s >= mapping->range_begin && v64.s <= mapping->range_end) {
                        printf("%s", print_count++ ? ", " : "");
-                       tracer_print_string(side_ptr_get(mapping->label.p), mapping->label.unit_size, mapping->label.byte_order, NULL);
+                       tracer_print_string(side_ptr_get(mapping->label.p), mapping->label.unit_size,
+                               side_enum_get(mapping->label.byte_order), NULL);
                }
        }
        if (!print_count)
@@ -475,7 +476,7 @@ void tracer_print_enum(const struct side_type *type_desc, const struct side_arg
        const struct side_type *elem_type = side_ptr_get(type_desc->u.side_enum.elem_type);
        union int64_value v64;
 
-       if (elem_type->type != item->type) {
+       if (side_enum_get(elem_type->type) != side_enum_get(item->type)) {
                fprintf(stderr, "ERROR: Unexpected enum element type\n");
                abort();
        }
@@ -492,7 +493,7 @@ uint32_t elem_type_to_stride(const struct side_type *elem_type)
 {
        uint32_t stride_bit;
 
-       switch (elem_type->type) {
+       switch (side_enum_get(elem_type->type)) {
        case SIDE_TYPE_BYTE:
                stride_bit = 8;
                break;
@@ -522,7 +523,7 @@ void tracer_print_enum_bitmap(const struct side_type *type_desc,
        uint32_t i, print_count = 0, stride_bit, nr_items;
        const struct side_arg *array_item;
 
-       switch (enum_elem_type->type) {
+       switch (side_enum_get(enum_elem_type->type)) {
        case SIDE_TYPE_U8:              /* Fall-through */
        case SIDE_TYPE_BYTE:            /* Fall-through */
        case SIDE_TYPE_U16:             /* Fall-through */
@@ -568,7 +569,7 @@ void tracer_print_enum_bitmap(const struct side_type *type_desc,
                for (bit = mapping->range_begin; bit <= mapping->range_end; bit++) {
                        if (bit > (nr_items * stride_bit) - 1)
                                break;
-                       if (elem_type->type == SIDE_TYPE_BYTE) {
+                       if (side_enum_get(elem_type->type) == SIDE_TYPE_BYTE) {
                                uint8_t v = array_item[bit / 8].u.side_static.byte_value;
                                if (v & (1ULL << (bit % 8))) {
                                        match = true;
@@ -589,7 +590,8 @@ void tracer_print_enum_bitmap(const struct side_type *type_desc,
 match:
                if (match) {
                        printf("%s", print_count++ ? ", " : "");
-                       tracer_print_string(side_ptr_get(mapping->label.p), mapping->label.unit_size, mapping->label.byte_order, NULL);
+                       tracer_print_string(side_ptr_get(mapping->label.p), mapping->label.unit_size,
+                               side_enum_get(mapping->label.byte_order), NULL);
                }
        }
        if (!print_count)
@@ -635,7 +637,7 @@ void tracer_print_type_bool(const char *separator,
                len_bits = type_bool->len_bits;
        if (len_bits + offset_bits > type_bool->bool_size * CHAR_BIT)
                abort();
-       reverse_bo = type_bool->byte_order != SIDE_TYPE_BYTE_ORDER_HOST;
+       reverse_bo = side_enum_get(type_bool->byte_order) != SIDE_TYPE_BYTE_ORDER_HOST;
        switch (type_bool->bool_size) {
        case 1:
                v = value->side_bool8;
@@ -729,7 +731,7 @@ void tracer_print_type_float(const char *separator,
        bool reverse_bo;
 
        tracer_print_type_header(separator, side_ptr_get(type_float->attr), type_float->nr_attr);
-       reverse_bo = type_float->byte_order != SIDE_TYPE_FLOAT_WORD_ORDER_HOST;
+       reverse_bo = side_enum_get(type_float->byte_order) != SIDE_TYPE_FLOAT_WORD_ORDER_HOST;
        switch (type_float->float_size) {
        case 2:
        {
@@ -818,9 +820,9 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg
 {
        enum side_type_label type;
 
-       switch (type_desc->type) {
+       switch (side_enum_get(type_desc->type)) {
        case SIDE_TYPE_ENUM:
-               switch (item->type) {
+               switch (side_enum_get(item->type)) {
                case SIDE_TYPE_U8:
                case SIDE_TYPE_U16:
                case SIDE_TYPE_U32:
@@ -838,7 +840,7 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg
                break;
 
        case SIDE_TYPE_ENUM_BITMAP:
-               switch (item->type) {
+               switch (side_enum_get(item->type)) {
                case SIDE_TYPE_U8:
                case SIDE_TYPE_BYTE:
                case SIDE_TYPE_U16:
@@ -855,7 +857,7 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg
                break;
 
        case SIDE_TYPE_GATHER_ENUM:
-               switch (item->type) {
+               switch (side_enum_get(item->type)) {
                case SIDE_TYPE_GATHER_INTEGER:
                        break;
                default:
@@ -866,7 +868,7 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg
                break;
 
        case SIDE_TYPE_DYNAMIC:
-               switch (item->type) {
+               switch (side_enum_get(item->type)) {
                case SIDE_TYPE_DYNAMIC_NULL:
                case SIDE_TYPE_DYNAMIC_BOOL:
                case SIDE_TYPE_DYNAMIC_INTEGER:
@@ -887,18 +889,17 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg
                break;
 
        default:
-               if (type_desc->type != item->type) {
+               if (side_enum_get(type_desc->type) != side_enum_get(item->type)) {
                        fprintf(stderr, "ERROR: type mismatch between description and arguments\n");
                        abort();
                }
                break;
        }
 
-       if (type_desc->type == SIDE_TYPE_ENUM || type_desc->type == SIDE_TYPE_ENUM_BITMAP ||
-                       type_desc->type == SIDE_TYPE_GATHER_ENUM)
-               type = (enum side_type_label) type_desc->type;
+       if (side_enum_get(type_desc->type) == SIDE_TYPE_ENUM || side_enum_get(type_desc->type) == SIDE_TYPE_ENUM_BITMAP || side_enum_get(type_desc->type) == SIDE_TYPE_GATHER_ENUM)
+               type = side_enum_get(type_desc->type);
        else
-               type = (enum side_type_label) item->type;
+               type = side_enum_get(item->type);
 
        printf("{ ");
        switch (type) {
@@ -947,7 +948,7 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg
        case SIDE_TYPE_STRING_UTF32:
                tracer_print_type_header(":", side_ptr_get(type_desc->u.side_string.attr), type_desc->u.side_string.nr_attr);
                tracer_print_string(side_ptr_get(item->u.side_static.string_value),
-                               type_desc->u.side_string.unit_size, type_desc->u.side_string.byte_order, NULL);
+                               type_desc->u.side_string.unit_size, side_enum_get(type_desc->u.side_string.byte_order), NULL);
                break;
 
                /* Stack-copy compound types */
@@ -1073,11 +1074,11 @@ void tracer_print_variant(const struct side_type *type_desc, const struct side_a
        union int64_value v64;
        uint32_t i;
 
-       if (selector_type->type != side_arg_variant->selector.type) {
+       if (side_enum_get(selector_type->type) != side_enum_get(side_arg_variant->selector.type)) {
                fprintf(stderr, "ERROR: Unexpected variant selector type\n");
                abort();
        }
-       switch (selector_type->type) {
+       switch (side_enum_get(selector_type->type)) {
        case SIDE_TYPE_U8:
        case SIDE_TYPE_U16:
        case SIDE_TYPE_U32:
@@ -1291,7 +1292,7 @@ uint32_t tracer_print_gather_string_type(const struct side_type_gather *type_gat
                        type_gather->u.side_string.type.nr_attr);
        if (ptr) {
                tracer_print_string(ptr, type_gather->u.side_string.type.unit_size,
-                               type_gather->u.side_string.type.byte_order, &string_len);
+                               side_enum_get(type_gather->u.side_string.type.byte_order), &string_len);
        } else {
                printf("<NULL>");
                string_len = type_gather->u.side_string.type.unit_size;
@@ -1305,7 +1306,7 @@ uint32_t tracer_print_gather_type(const struct side_type *type_desc, const void
        uint32_t len;
 
        printf("{ ");
-       switch (type_desc->type) {
+       switch (side_enum_get(type_desc->type)) {
                /* Gather basic types */
        case SIDE_TYPE_GATHER_BOOL:
                len = tracer_print_gather_bool_type(&type_desc->u.side_gather, ptr);
@@ -1428,7 +1429,7 @@ uint32_t tracer_print_gather_array(const struct side_type_gather *type_gather, c
        for (i = 0; i < type_gather->u.side_array.type.length; i++) {
                const struct side_type *elem_type = side_ptr_get(type_gather->u.side_array.type.elem_type);
 
-               switch (elem_type->type) {
+               switch (side_enum_get(elem_type->type)) {
                case SIDE_TYPE_GATHER_VLA:
                        fprintf(stderr, "<gather VLA only supported within gather structures>\n");
                        abort();
@@ -1455,7 +1456,7 @@ uint32_t tracer_print_gather_vla(const struct side_type_gather *type_gather, con
        uint32_t i, length;
 
        /* Access length */
-       switch (length_type->type) {
+       switch (side_enum_get(length_type->type)) {
        case SIDE_TYPE_GATHER_INTEGER:
                break;
        default:
@@ -1474,7 +1475,7 @@ uint32_t tracer_print_gather_vla(const struct side_type_gather *type_gather, con
        for (i = 0; i < length; i++) {
                const struct side_type *elem_type = side_ptr_get(type_gather->u.side_vla.type.elem_type);
 
-               switch (elem_type->type) {
+               switch (side_enum_get(elem_type->type)) {
                case SIDE_TYPE_GATHER_VLA:
                        fprintf(stderr, "<gather VLA only supported within gather structures>\n");
                        abort();
@@ -1516,12 +1517,14 @@ void tracer_print_vla_visitor(const struct side_type *type_desc, void *app_ctx)
                .write_elem = tracer_write_elem_cb,
                .priv = &tracer_priv,
        };
+       side_visitor_func func;
 
        print_attributes("attr", ":", side_ptr_get(type_desc->u.side_vla_visitor.attr), type_desc->u.side_vla_visitor.nr_attr);
        printf("%s", type_desc->u.side_vla_visitor.nr_attr ? ", " : "");
        printf("elements: ");
        printf("[ ");
-       status = type_desc->u.side_vla_visitor.visitor(&tracer_ctx, app_ctx);
+       func = side_ptr_get(type_desc->u.side_vla_visitor.visitor);
+       status = func(&tracer_ctx, app_ctx);
        switch (status) {
        case SIDE_VISITOR_STATUS_OK:
                break;
@@ -1579,13 +1582,13 @@ void tracer_print_dynamic_struct_visitor(const struct side_arg *item)
                .write_field = tracer_dynamic_struct_write_elem_cb,
                .priv = &tracer_priv,
        };
-       void *app_ctx = item->u.side_dynamic.side_dynamic_struct_visitor.app_ctx;
+       void *app_ctx = side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor.app_ctx);
 
        print_attributes("attr", "::", side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor.attr), item->u.side_dynamic.side_dynamic_struct_visitor.nr_attr);
        printf("%s", item->u.side_dynamic.side_dynamic_struct_visitor.nr_attr ? ", " : "");
        printf("fields:: ");
        printf("[ ");
-       status = item->u.side_dynamic.side_dynamic_struct_visitor.visitor(&tracer_ctx, app_ctx);
+       status = side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor.visitor)(&tracer_ctx, app_ctx);
        switch (status) {
        case SIDE_VISITOR_STATUS_OK:
                break;
@@ -1641,13 +1644,13 @@ void tracer_print_dynamic_vla_visitor(const struct side_arg *item)
                .write_elem = tracer_dynamic_vla_write_elem_cb,
                .priv = &tracer_priv,
        };
-       void *app_ctx = item->u.side_dynamic.side_dynamic_vla_visitor.app_ctx;
+       void *app_ctx = side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor.app_ctx);
 
        print_attributes("attr", "::", side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor.attr), item->u.side_dynamic.side_dynamic_vla_visitor.nr_attr);
        printf("%s", item->u.side_dynamic.side_dynamic_vla_visitor.nr_attr ? ", " : "");
        printf("elements:: ");
        printf("[ ");
-       status = item->u.side_dynamic.side_dynamic_vla_visitor.visitor(&tracer_ctx, app_ctx);
+       status = side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor.visitor)(&tracer_ctx, app_ctx);
        switch (status) {
        case SIDE_VISITOR_STATUS_OK:
                break;
@@ -1662,7 +1665,7 @@ static
 void tracer_print_dynamic(const struct side_arg *item)
 {
        printf("{ ");
-       switch (item->type) {
+       switch (side_enum_get(item->type)) {
                /* Dynamic basic types */
        case SIDE_TYPE_DYNAMIC_NULL:
                tracer_print_type_header("::", side_ptr_get(item->u.side_dynamic.side_null.attr),
@@ -1692,7 +1695,7 @@ void tracer_print_dynamic(const struct side_arg *item)
                tracer_print_type_header("::", side_ptr_get(item->u.side_dynamic.side_string.type.attr), item->u.side_dynamic.side_string.type.nr_attr);
                tracer_print_string((const char *)(uintptr_t) item->u.side_dynamic.side_string.value,
                                item->u.side_dynamic.side_string.type.unit_size,
-                               item->u.side_dynamic.side_string.type.byte_order, NULL);
+                               side_enum_get(item->u.side_dynamic.side_string.type.byte_order), NULL);
                break;
 
                /* Dynamic compound types */
@@ -1723,7 +1726,7 @@ void tracer_print_static_fields(const struct side_event_description *desc,
        const struct side_arg *sav = side_ptr_get(side_arg_vec->sav);
        uint32_t i, side_sav_len = side_arg_vec->len;
 
-       printf("provider: %s, event: %s", desc->provider_name, desc->event_name);
+       printf("provider: %s, event: %s", side_ptr_get(desc->provider_name), side_ptr_get(desc->event_name));
        if (desc->nr_fields != side_sav_len) {
                fprintf(stderr, "ERROR: number of fields mismatch between description and arguments\n");
                abort();
@@ -1732,7 +1735,7 @@ void tracer_print_static_fields(const struct side_event_description *desc,
        printf("%s", side_sav_len ? ", fields: [ " : "");
        for (i = 0; i < side_sav_len; i++) {
                printf("%s", i ? ", " : "");
-               tracer_print_field(&desc->fields[i], &sav[i]);
+               tracer_print_field(&side_ptr_get(desc->fields)[i], &sav[i]);
        }
        if (nr_items)
                *nr_items = i;
@@ -1795,7 +1798,7 @@ void tracer_event_notification(enum side_tracer_notification notif,
                if (!event)
                        continue;
                printf("provider: %s, event: %s\n",
-                       event->provider_name, event->event_name);
+                       side_ptr_get(event->provider_name), side_ptr_get(event->event_name));
                if (notif == SIDE_TRACER_NOTIFICATION_INSERT_EVENTS) {
                        if (event->flags & SIDE_EVENT_FLAG_VARIADIC) {
                                ret = side_tracer_callback_variadic_register(event, tracer_call_variadic, NULL);
Software Instrumentation Dynamically Enabled
This page took 0.029018 seconds and 4 git commands to generate.