X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Ftracer.c;h=65887fb70ca669634147b42795ae5cfbf3c0c0d8;hb=6910c28cd9c7313148445698ec5bc5a4fa285ee3;hp=aea52dc8c357e7411bf66e16de9c65246b2a5fb2;hpb=ab8a626e50dd553d26dfbe5b40bf5b8a03f8ee1a;p=libside.git diff --git a/src/tracer.c b/src/tracer.c index aea52dc..65887fb 100644 --- a/src/tracer.c +++ b/src/tracer.c @@ -30,6 +30,8 @@ static struct side_tracer_handle *tracer_handle; static void tracer_print_struct(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec); static +void tracer_print_variant(const struct side_type *type_desc, const struct side_arg_variant *side_arg_variant); +static void tracer_print_array(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec); static void tracer_print_vla(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec); @@ -227,10 +229,10 @@ enum tracer_display_base get_attr_display_base(const struct side_attr *_attr, ui char *utf8_str = NULL; bool cmp; - tracer_convert_string_to_utf8(attr->key.p, attr->key.unit_size, + tracer_convert_string_to_utf8(side_ptr_get(attr->key.p), attr->key.unit_size, attr->key.byte_order, NULL, &utf8_str); cmp = strcmp(utf8_str, "std.integer.base"); - if (utf8_str != attr->key.p) + if (utf8_str != side_ptr_get(attr->key.p)) free(utf8_str); if (!cmp) { int64_t val = get_attr_integer_value(attr); @@ -258,10 +260,10 @@ void tracer_print_attr_type(const char *separator, const struct side_attr *attr) { char *utf8_str = NULL; - tracer_convert_string_to_utf8(attr->key.p, attr->key.unit_size, + tracer_convert_string_to_utf8(side_ptr_get(attr->key.p), attr->key.unit_size, attr->key.byte_order, NULL, &utf8_str); printf("{ key%s \"%s\", value%s ", separator, utf8_str, separator); - if (utf8_str != attr->key.p) + if (utf8_str != side_ptr_get(attr->key.p)) free(utf8_str); switch (attr->value.type) { case SIDE_ATTR_TYPE_BOOL: @@ -324,7 +326,7 @@ void tracer_print_attr_type(const char *separator, const struct side_attr *attr) abort(); #endif case SIDE_ATTR_TYPE_STRING: - tracer_print_string(attr->value.u.string_value.p, + 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); break; @@ -449,7 +451,7 @@ void print_enum_labels(const struct side_enum_mappings *mappings, union int64_va printf(", labels: [ "); for (i = 0; i < mappings->nr_mappings; i++) { - const struct side_enum_mapping *mapping = &mappings->mappings[i]; + const struct side_enum_mapping *mapping = &side_ptr_get(mappings->mappings)[i]; if (mapping->range_end < mapping->range_begin) { fprintf(stderr, "ERROR: Unexpected enum range: %" PRIu64 "-%" PRIu64 "\n", @@ -458,7 +460,7 @@ 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(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, mapping->label.byte_order, NULL); } } if (!print_count) @@ -469,8 +471,8 @@ void print_enum_labels(const struct side_enum_mappings *mappings, union int64_va static void tracer_print_enum(const struct side_type *type_desc, const struct side_arg *item) { - const struct side_enum_mappings *mappings = type_desc->u.side_enum.mappings; - const struct side_type *elem_type = type_desc->u.side_enum.elem_type; + const struct side_enum_mappings *mappings = side_ptr_get(type_desc->u.side_enum.mappings); + 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) { @@ -479,7 +481,7 @@ void tracer_print_enum(const struct side_type *type_desc, const struct side_arg } v64 = tracer_load_integer_value(&elem_type->u.side_integer, &item->u.side_static.integer_value, 0, NULL); - print_attributes("attr", ":", mappings->attr, mappings->nr_attr); + print_attributes("attr", ":", side_ptr_get(mappings->attr), mappings->nr_attr); printf("%s", mappings->nr_attr ? ", " : ""); tracer_print_type(elem_type, item); print_enum_labels(mappings, v64); @@ -515,8 +517,8 @@ static void tracer_print_enum_bitmap(const struct side_type *type_desc, const struct side_arg *item) { - const struct side_enum_bitmap_mappings *side_enum_mappings = type_desc->u.side_enum_bitmap.mappings; - const struct side_type *enum_elem_type = type_desc->u.side_enum_bitmap.elem_type, *elem_type; + const struct side_enum_bitmap_mappings *side_enum_mappings = side_ptr_get(type_desc->u.side_enum_bitmap.mappings); + const struct side_type *enum_elem_type = side_ptr_get(type_desc->u.side_enum_bitmap.elem_type), *elem_type; uint32_t i, print_count = 0, stride_bit, nr_items; const struct side_arg *array_item; @@ -535,14 +537,14 @@ void tracer_print_enum_bitmap(const struct side_type *type_desc, nr_items = 1; break; case SIDE_TYPE_ARRAY: - elem_type = enum_elem_type->u.side_array.elem_type; - array_item = item->u.side_static.side_array->sav; + elem_type = side_ptr_get(enum_elem_type->u.side_array.elem_type); + array_item = side_ptr_get(item->u.side_static.side_array)->sav; nr_items = type_desc->u.side_array.length; break; case SIDE_TYPE_VLA: - elem_type = enum_elem_type->u.side_vla.elem_type; - array_item = item->u.side_static.side_vla->sav; - nr_items = item->u.side_static.side_vla->len; + elem_type = side_ptr_get(enum_elem_type->u.side_vla.elem_type); + array_item = side_ptr_get(item->u.side_static.side_vla)->sav; + nr_items = side_ptr_get(item->u.side_static.side_vla)->len; break; default: fprintf(stderr, "ERROR: Unexpected enum element type\n"); @@ -550,11 +552,11 @@ void tracer_print_enum_bitmap(const struct side_type *type_desc, } stride_bit = elem_type_to_stride(elem_type); - print_attributes("attr", ":", side_enum_mappings->attr, side_enum_mappings->nr_attr); + print_attributes("attr", ":", side_ptr_get(side_enum_mappings->attr), side_enum_mappings->nr_attr); printf("%s", side_enum_mappings->nr_attr ? ", " : ""); printf("labels: [ "); for (i = 0; i < side_enum_mappings->nr_mappings; i++) { - const struct side_enum_bitmap_mapping *mapping = &side_enum_mappings->mappings[i]; + const struct side_enum_bitmap_mapping *mapping = &side_ptr_get(side_enum_mappings->mappings)[i]; bool match = false; uint64_t bit; @@ -587,7 +589,7 @@ void tracer_print_enum_bitmap(const struct side_type *type_desc, match: if (match) { printf("%s", print_count++ ? ", " : ""); - tracer_print_string(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, mapping->label.byte_order, NULL); } } if (!print_count) @@ -674,7 +676,7 @@ void tracer_print_type_bool(const char *separator, v >>= offset_bits; if (len_bits < 64) v &= (1ULL << len_bits) - 1; - tracer_print_type_header(separator, type_bool->attr, type_bool->nr_attr); + tracer_print_type_header(separator, side_ptr_get(type_bool->attr), type_bool->nr_attr); printf("%s", v ? "true" : "false"); } @@ -690,8 +692,8 @@ void tracer_print_type_integer(const char *separator, uint16_t len_bits; v64 = tracer_load_integer_value(type_integer, value, offset_bits, &len_bits); - tracer_print_type_header(separator, type_integer->attr, type_integer->nr_attr); - base = get_attr_display_base(type_integer->attr, type_integer->nr_attr, default_base); + tracer_print_type_header(separator, side_ptr_get(type_integer->attr), type_integer->nr_attr); + base = get_attr_display_base(side_ptr_get(type_integer->attr), type_integer->nr_attr, default_base); switch (base) { case TRACER_DISPLAY_BASE_2: print_integer_binary(v64.u, len_bits); @@ -726,7 +728,7 @@ void tracer_print_type_float(const char *separator, { bool reverse_bo; - tracer_print_type_header(separator, type_float->attr, type_float->nr_attr); + 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; switch (type_float->float_size) { case 2: @@ -902,7 +904,8 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg switch (type) { /* Stack-copy basic types */ case SIDE_TYPE_NULL: - tracer_print_type_header(":", type_desc->u.side_null.attr, type_desc->u.side_null.nr_attr); + tracer_print_type_header(":", side_ptr_get(type_desc->u.side_null.attr), + type_desc->u.side_null.nr_attr); printf(""); break; @@ -923,7 +926,7 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg break; case SIDE_TYPE_BYTE: - tracer_print_type_header(":", type_desc->u.side_byte.attr, type_desc->u.side_byte.nr_attr); + tracer_print_type_header(":", side_ptr_get(type_desc->u.side_byte.attr), type_desc->u.side_byte.nr_attr); printf("0x%" PRIx8, item->u.side_static.byte_value); break; @@ -942,20 +945,23 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg case SIDE_TYPE_STRING_UTF8: case SIDE_TYPE_STRING_UTF16: case SIDE_TYPE_STRING_UTF32: - tracer_print_type_header(":", type_desc->u.side_string.attr, type_desc->u.side_string.nr_attr); - tracer_print_string((const void *)(uintptr_t) item->u.side_static.string_value, + 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); break; /* Stack-copy compound types */ case SIDE_TYPE_STRUCT: - tracer_print_struct(type_desc, item->u.side_static.side_struct); + tracer_print_struct(type_desc, side_ptr_get(item->u.side_static.side_struct)); + break; + case SIDE_TYPE_VARIANT: + tracer_print_variant(type_desc, side_ptr_get(item->u.side_static.side_variant)); break; case SIDE_TYPE_ARRAY: - tracer_print_array(type_desc, item->u.side_static.side_array); + tracer_print_array(type_desc, side_ptr_get(item->u.side_static.side_array)); break; case SIDE_TYPE_VLA: - tracer_print_vla(type_desc, item->u.side_static.side_vla); + tracer_print_vla(type_desc, side_ptr_get(item->u.side_static.side_vla)); break; case SIDE_TYPE_VLA_VISITOR: tracer_print_vla_visitor(type_desc, item->u.side_static.side_vla_app_visitor_ctx); @@ -1034,7 +1040,7 @@ void tracer_print_type(const struct side_type *type_desc, const struct side_arg static void tracer_print_field(const struct side_event_field *item_desc, const struct side_arg *item) { - printf("%s: ", item_desc->field_name); + printf("%s: ", side_ptr_get(item_desc->field_name)); tracer_print_type(&item_desc->side_type, item); } @@ -1042,22 +1048,63 @@ static void tracer_print_struct(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec) { const struct side_arg *sav = side_arg_vec->sav; + const struct side_type_struct *side_struct = side_ptr_get(type_desc->u.side_struct); uint32_t i, side_sav_len = side_arg_vec->len; - if (type_desc->u.side_struct->nr_fields != side_sav_len) { + if (side_struct->nr_fields != side_sav_len) { fprintf(stderr, "ERROR: number of fields mismatch between description and arguments of structure\n"); abort(); } - print_attributes("attr", ":", type_desc->u.side_struct->attr, type_desc->u.side_struct->nr_attr); - printf("%s", type_desc->u.side_struct->nr_attr ? ", " : ""); + print_attributes("attr", ":", side_ptr_get(side_struct->attr), side_struct->nr_attr); + printf("%s", side_struct->nr_attr ? ", " : ""); printf("fields: { "); for (i = 0; i < side_sav_len; i++) { printf("%s", i ? ", " : ""); - tracer_print_field(&type_desc->u.side_struct->fields[i], &sav[i]); + tracer_print_field(&side_ptr_get(side_struct->fields)[i], &sav[i]); } printf(" }"); } +static +void tracer_print_variant(const struct side_type *type_desc, const struct side_arg_variant *side_arg_variant) +{ + const struct side_type_variant *side_type_variant = side_ptr_get(type_desc->u.side_variant); + const struct side_type *selector_type = &side_type_variant->selector; + union int64_value v64; + uint32_t i; + + if (selector_type->type != side_arg_variant->selector.type) { + fprintf(stderr, "ERROR: Unexpected variant selector type\n"); + abort(); + } + switch (selector_type->type) { + case SIDE_TYPE_U8: + case SIDE_TYPE_U16: + case SIDE_TYPE_U32: + case SIDE_TYPE_U64: + case SIDE_TYPE_S8: + case SIDE_TYPE_S16: + case SIDE_TYPE_S32: + case SIDE_TYPE_S64: + break; + default: + fprintf(stderr, "ERROR: Expecting integer variant selector type\n"); + abort(); + } + v64 = tracer_load_integer_value(&selector_type->u.side_integer, + &side_arg_variant->selector.u.side_static.integer_value, 0, NULL); + for (i = 0; i < side_type_variant->nr_options; i++) { + const struct side_variant_option *option = &side_ptr_get(side_type_variant->options)[i]; + + if (v64.s >= option->range_begin && v64.s <= option->range_end) { + tracer_print_type(&option->side_type, &side_arg_variant->option); + return; + } + } + fprintf(stderr, "ERROR: Variant selector value unknown %" PRId64 "\n", v64.s); + abort(); +} + static void tracer_print_array(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec) { @@ -1068,13 +1115,13 @@ void tracer_print_array(const struct side_type *type_desc, const struct side_arg fprintf(stderr, "ERROR: length mismatch between description and arguments of array\n"); abort(); } - print_attributes("attr", ":", type_desc->u.side_array.attr, type_desc->u.side_array.nr_attr); + print_attributes("attr", ":", side_ptr_get(type_desc->u.side_array.attr), type_desc->u.side_array.nr_attr); printf("%s", type_desc->u.side_array.nr_attr ? ", " : ""); printf("elements: "); printf("[ "); for (i = 0; i < side_sav_len; i++) { printf("%s", i ? ", " : ""); - tracer_print_type(type_desc->u.side_array.elem_type, &sav[i]); + tracer_print_type(side_ptr_get(type_desc->u.side_array.elem_type), &sav[i]); } printf(" ]"); } @@ -1085,13 +1132,13 @@ void tracer_print_vla(const struct side_type *type_desc, const struct side_arg_v const struct side_arg *sav = side_arg_vec->sav; uint32_t i, side_sav_len = side_arg_vec->len; - print_attributes("attr", ":", type_desc->u.side_vla.attr, type_desc->u.side_vla.nr_attr); + print_attributes("attr", ":", side_ptr_get(type_desc->u.side_vla.attr), type_desc->u.side_vla.nr_attr); printf("%s", type_desc->u.side_vla.nr_attr ? ", " : ""); printf("elements: "); printf("[ "); for (i = 0; i < side_sav_len; i++) { printf("%s", i ? ", " : ""); - tracer_print_type(type_desc->u.side_vla.elem_type, &sav[i]); + tracer_print_type(side_ptr_get(type_desc->u.side_vla.elem_type), &sav[i]); } printf(" ]"); } @@ -1104,7 +1151,7 @@ const char *tracer_gather_access(enum side_type_gather_access_mode access_mode, return ptr; case SIDE_TYPE_GATHER_ACCESS_POINTER: /* Dereference pointer */ - memcpy(&ptr, ptr, sizeof(ptr)); + memcpy(&ptr, ptr, sizeof(const char *)); return ptr; default: abort(); @@ -1175,7 +1222,7 @@ uint32_t tracer_print_gather_byte_type(const struct side_type_gather *type_gathe ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_byte.offset); memcpy(&value, ptr, 1); - tracer_print_type_header(":", type_gather->u.side_byte.type.attr, + tracer_print_type_header(":", side_ptr_get(type_gather->u.side_byte.type.attr), type_gather->u.side_byte.type.nr_attr); printf("0x%" PRIx8, value); return tracer_gather_size(access_mode, 1); @@ -1240,7 +1287,7 @@ uint32_t tracer_print_gather_string_type(const struct side_type_gather *type_gat size_t string_len; ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_string.offset); - tracer_print_type_header(":", type_gather->u.side_string.type.attr, + tracer_print_type_header(":", side_ptr_get(type_gather->u.side_string.type.attr), type_gather->u.side_string.type.nr_attr); if (ptr) { tracer_print_string(ptr, type_gather->u.side_string.type.unit_size, @@ -1307,8 +1354,8 @@ uint32_t tracer_print_gather_type(const struct side_type *type_desc, const void static uint32_t tracer_print_gather_enum_type(const struct side_type_gather *type_gather, const void *_ptr) { - const struct side_enum_mappings *mappings = type_gather->u.side_enum.mappings; - const struct side_type *enum_elem_type = type_gather->u.side_enum.elem_type; + const struct side_enum_mappings *mappings = side_ptr_get(type_gather->u.side_enum.mappings); + const struct side_type *enum_elem_type = side_ptr_get(type_gather->u.side_enum.elem_type); const struct side_type_gather_integer *side_integer = &enum_elem_type->u.side_gather.u.side_integer; enum side_type_gather_access_mode access_mode = (enum side_type_gather_access_mode) side_integer->access_mode; @@ -1329,7 +1376,7 @@ uint32_t tracer_print_gather_enum_type(const struct side_type_gather *type_gathe ptr = tracer_gather_access(access_mode, ptr + side_integer->offset); memcpy(&value, ptr, integer_size_bytes); v64 = tracer_load_gather_integer_value(side_integer, &value); - print_attributes("attr", ":", mappings->attr, mappings->nr_attr); + print_attributes("attr", ":", side_ptr_get(mappings->attr), mappings->nr_attr); printf("%s", mappings->nr_attr ? ", " : ""); tracer_print_gather_type(enum_elem_type, ptr); print_enum_labels(mappings, v64); @@ -1339,7 +1386,7 @@ uint32_t tracer_print_gather_enum_type(const struct side_type_gather *type_gathe static void tracer_print_gather_field(const struct side_event_field *field, const void *ptr) { - printf("%s: ", field->field_name); + printf("%s: ", side_ptr_get(field->field_name)); (void) tracer_print_gather_type(&field->side_type, ptr); } @@ -1348,16 +1395,17 @@ uint32_t tracer_print_gather_struct(const struct side_type_gather *type_gather, { enum side_type_gather_access_mode access_mode = (enum side_type_gather_access_mode) type_gather->u.side_struct.access_mode; + const struct side_type_struct *side_struct = side_ptr_get(type_gather->u.side_struct.type); const char *ptr = (const char *) _ptr; uint32_t i; ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_struct.offset); - print_attributes("attr", ":", type_gather->u.side_struct.type->attr, type_gather->u.side_struct.type->nr_attr); - printf("%s", type_gather->u.side_struct.type->nr_attr ? ", " : ""); + print_attributes("attr", ":", side_ptr_get(side_struct->attr), side_struct->nr_attr); + printf("%s", side_struct->nr_attr ? ", " : ""); printf("fields: { "); - for (i = 0; i < type_gather->u.side_struct.type->nr_fields; i++) { + for (i = 0; i < side_struct->nr_fields; i++) { printf("%s", i ? ", " : ""); - tracer_print_gather_field(&type_gather->u.side_struct.type->fields[i], ptr); + tracer_print_gather_field(&side_ptr_get(side_struct->fields)[i], ptr); } printf(" }"); return tracer_gather_size(access_mode, type_gather->u.side_struct.size); @@ -1373,12 +1421,14 @@ uint32_t tracer_print_gather_array(const struct side_type_gather *type_gather, c ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_array.offset); orig_ptr = ptr; - print_attributes("attr", ":", type_gather->u.side_array.type.attr, type_gather->u.side_array.type.nr_attr); + print_attributes("attr", ":", side_ptr_get(type_gather->u.side_array.type.attr), type_gather->u.side_array.type.nr_attr); printf("%s", type_gather->u.side_array.type.nr_attr ? ", " : ""); printf("elements: "); printf("[ "); for (i = 0; i < type_gather->u.side_array.type.length; i++) { - switch (type_gather->u.side_array.type.elem_type->type) { + const struct side_type *elem_type = side_ptr_get(type_gather->u.side_array.type.elem_type); + + switch (elem_type->type) { case SIDE_TYPE_GATHER_VLA: fprintf(stderr, "\n"); abort(); @@ -1386,7 +1436,7 @@ uint32_t tracer_print_gather_array(const struct side_type_gather *type_gather, c break; } printf("%s", i ? ", " : ""); - ptr += tracer_print_gather_type(type_gather->u.side_array.type.elem_type, ptr); + ptr += tracer_print_gather_type(elem_type, ptr); } printf(" ]"); return tracer_gather_size(access_mode, ptr - orig_ptr); @@ -1398,30 +1448,33 @@ uint32_t tracer_print_gather_vla(const struct side_type_gather *type_gather, con { enum side_type_gather_access_mode access_mode = (enum side_type_gather_access_mode) type_gather->u.side_vla.access_mode; + const struct side_type *length_type = side_ptr_get(type_gather->u.side_vla.length_type); const char *ptr = (const char *) _ptr, *orig_ptr; const char *length_ptr = (const char *) _length_ptr; union int64_value v64; uint32_t i, length; /* Access length */ - switch (type_gather->u.side_vla.length_type->type) { + switch (length_type->type) { case SIDE_TYPE_GATHER_INTEGER: break; default: fprintf(stderr, "\n"); abort(); } - v64 = tracer_load_gather_integer_value(&type_gather->u.side_vla.length_type->u.side_gather.u.side_integer, + v64 = tracer_load_gather_integer_value(&length_type->u.side_gather.u.side_integer, length_ptr); length = (uint32_t) v64.u; ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_vla.offset); orig_ptr = ptr; - print_attributes("attr", ":", type_gather->u.side_vla.type.attr, type_gather->u.side_vla.type.nr_attr); + print_attributes("attr", ":", side_ptr_get(type_gather->u.side_vla.type.attr), type_gather->u.side_vla.type.nr_attr); printf("%s", type_gather->u.side_vla.type.nr_attr ? ", " : ""); printf("elements: "); printf("[ "); for (i = 0; i < length; i++) { - switch (type_gather->u.side_vla.type.elem_type->type) { + const struct side_type *elem_type = side_ptr_get(type_gather->u.side_vla.type.elem_type); + + switch (elem_type->type) { case SIDE_TYPE_GATHER_VLA: fprintf(stderr, "\n"); abort(); @@ -1429,7 +1482,7 @@ uint32_t tracer_print_gather_vla(const struct side_type_gather *type_gather, con break; } printf("%s", i ? ", " : ""); - ptr += tracer_print_gather_type(type_gather->u.side_vla.type.elem_type, ptr); + ptr += tracer_print_gather_type(elem_type, ptr); } printf(" ]"); return tracer_gather_size(access_mode, ptr - orig_ptr); @@ -1456,7 +1509,7 @@ void tracer_print_vla_visitor(const struct side_type *type_desc, void *app_ctx) { enum side_visitor_status status; struct tracer_visitor_priv tracer_priv = { - .elem_type = type_desc->u.side_vla_visitor.elem_type, + .elem_type = side_ptr_get(type_desc->u.side_vla_visitor.elem_type), .i = 0, }; const struct side_tracer_visitor_ctx tracer_ctx = { @@ -1464,7 +1517,7 @@ void tracer_print_vla_visitor(const struct side_type *type_desc, void *app_ctx) .priv = &tracer_priv, }; - print_attributes("attr", ":", type_desc->u.side_vla_visitor.attr, type_desc->u.side_vla_visitor.nr_attr); + 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("[ "); @@ -1485,7 +1538,7 @@ void tracer_print_dynamic_struct(const struct side_arg_dynamic_struct *dynamic_s const struct side_arg_dynamic_field *fields = dynamic_struct->fields; uint32_t i, len = dynamic_struct->len; - print_attributes("attr", "::", dynamic_struct->attr, dynamic_struct->nr_attr); + print_attributes("attr", "::", side_ptr_get(dynamic_struct->attr), dynamic_struct->nr_attr); printf("%s", dynamic_struct->nr_attr ? ", " : ""); printf("fields:: "); printf("[ "); @@ -1528,7 +1581,7 @@ void tracer_print_dynamic_struct_visitor(const struct side_arg *item) }; void *app_ctx = item->u.side_dynamic.side_dynamic_struct_visitor.app_ctx; - print_attributes("attr", "::", item->u.side_dynamic.side_dynamic_struct_visitor.attr, item->u.side_dynamic.side_dynamic_struct_visitor.nr_attr); + 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("[ "); @@ -1549,7 +1602,7 @@ void tracer_print_dynamic_vla(const struct side_arg_dynamic_vla *vla) const struct side_arg *sav = vla->sav; uint32_t i, side_sav_len = vla->len; - print_attributes("attr", "::", vla->attr, vla->nr_attr); + print_attributes("attr", "::", side_ptr_get(vla->attr), vla->nr_attr); printf("%s", vla->nr_attr ? ", " : ""); printf("elements:: "); printf("[ "); @@ -1590,7 +1643,7 @@ void tracer_print_dynamic_vla_visitor(const struct side_arg *item) }; void *app_ctx = item->u.side_dynamic.side_dynamic_vla_visitor.app_ctx; - print_attributes("attr", "::", item->u.side_dynamic.side_dynamic_vla_visitor.attr, item->u.side_dynamic.side_dynamic_vla_visitor.nr_attr); + 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("[ "); @@ -1612,7 +1665,8 @@ void tracer_print_dynamic(const struct side_arg *item) switch (item->type) { /* Dynamic basic types */ case SIDE_TYPE_DYNAMIC_NULL: - tracer_print_type_header("::", item->u.side_dynamic.side_null.attr, item->u.side_dynamic.side_null.nr_attr); + tracer_print_type_header("::", side_ptr_get(item->u.side_dynamic.side_null.attr), + item->u.side_dynamic.side_null.nr_attr); printf(""); break; case SIDE_TYPE_DYNAMIC_BOOL: @@ -1623,7 +1677,7 @@ void tracer_print_dynamic(const struct side_arg *item) TRACER_DISPLAY_BASE_10); break; case SIDE_TYPE_DYNAMIC_BYTE: - tracer_print_type_header("::", item->u.side_dynamic.side_byte.type.attr, item->u.side_dynamic.side_byte.type.nr_attr); + tracer_print_type_header("::", side_ptr_get(item->u.side_dynamic.side_byte.type.attr), item->u.side_dynamic.side_byte.type.nr_attr); printf("0x%" PRIx8, item->u.side_dynamic.side_byte.value); break; case SIDE_TYPE_DYNAMIC_POINTER: @@ -1635,7 +1689,7 @@ void tracer_print_dynamic(const struct side_arg *item) &item->u.side_dynamic.side_float.value); break; case SIDE_TYPE_DYNAMIC_STRING: - tracer_print_type_header("::", item->u.side_dynamic.side_string.type.attr, item->u.side_dynamic.side_string.type.nr_attr); + 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); @@ -1674,7 +1728,7 @@ void tracer_print_static_fields(const struct side_event_description *desc, fprintf(stderr, "ERROR: number of fields mismatch between description and arguments\n"); abort(); } - print_attributes(", attr", ":", desc->attr, desc->nr_attr); + print_attributes(", attr", ":", side_ptr_get(desc->attr), desc->nr_attr); printf("%s", side_sav_len ? ", fields: [ " : ""); for (i = 0; i < side_sav_len; i++) { printf("%s", i ? ", " : ""); @@ -1686,6 +1740,7 @@ void tracer_print_static_fields(const struct side_event_description *desc, printf(" ]"); } +static void tracer_call(const struct side_event_description *desc, const struct side_arg_vec *side_arg_vec, void *priv __attribute__((unused))) @@ -1696,6 +1751,7 @@ void tracer_call(const struct side_event_description *desc, printf("\n"); } +static void tracer_call_variadic(const struct side_event_description *desc, const struct side_arg_vec *side_arg_vec, const struct side_arg_dynamic_struct *var_struct, @@ -1709,7 +1765,7 @@ void tracer_call_variadic(const struct side_event_description *desc, fprintf(stderr, "ERROR: unexpected non-variadic event description\n"); abort(); } - print_attributes(", attr ", "::", var_struct->attr, var_struct->nr_attr); + print_attributes(", attr ", "::", side_ptr_get(var_struct->attr), var_struct->nr_attr); printf("%s", var_struct_len ? ", fields:: [ " : ""); for (i = 0; i < var_struct_len; i++, nr_fields++) { printf("%s", i ? ", " : ""); @@ -1721,8 +1777,10 @@ void tracer_call_variadic(const struct side_event_description *desc, printf("\n"); } +static void tracer_event_notification(enum side_tracer_notification notif, - struct side_event_description **events, uint32_t nr_events, void *priv) + struct side_event_description **events, uint32_t nr_events, + void *priv __attribute__((unused))) { uint32_t i; int ret; @@ -1738,7 +1796,7 @@ void tracer_event_notification(enum side_tracer_notification notif, continue; printf("provider: %s, event: %s\n", event->provider_name, event->event_name); - if (notif == SIDE_TRACER_NOTIFICATION_INSERT_EVENTS) { + 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); if (ret)