From 66de373e8c6c6093772603d57f98bd9efcc57931 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 4 Nov 2022 16:05:58 -0400 Subject: [PATCH] Refactoring: combine static and dynamic types Signed-off-by: Mathieu Desnoyers --- include/side/trace.h | 591 ++++++++++++++++++++++--------------------- src/side.c | 12 +- src/test.c | 112 ++++---- src/tracer.c | 349 ++++++++++++++----------- src/tracer.h | 4 +- 5 files changed, 562 insertions(+), 506 deletions(-) diff --git a/include/side/trace.h b/include/side/trace.h index b9992d6..cd41dfb 100644 --- a/include/side/trace.h +++ b/include/side/trace.h @@ -20,11 +20,11 @@ //fixed forever, or think of a scheme that would allow their binary //representation to be extended if need be. +struct side_arg; struct side_arg_vec; -struct side_arg_vec_description; -struct side_arg_dynamic_vec; -struct side_arg_dynamic_vec_vla; -struct side_type_description; +struct side_arg_dynamic; +struct side_arg_dynamic_vla; +struct side_type; struct side_event_field; struct side_event_field_sg; struct side_tracer_visitor_ctx; @@ -34,8 +34,8 @@ struct side_event_description; struct side_arg_dynamic_event_struct; struct side_events_register_handle; -enum side_type { - /* Basic types */ +enum side_type_label { + /* Statically declared types */ SIDE_TYPE_NULL, SIDE_TYPE_BOOL, SIDE_TYPE_U8, @@ -55,7 +55,7 @@ enum side_type { SIDE_TYPE_FLOAT_BINARY128, SIDE_TYPE_STRING, - /* Compound types */ + /* Statically declared compound types */ SIDE_TYPE_STRUCT, SIDE_TYPE_STRUCT_SG, SIDE_TYPE_ARRAY, @@ -86,40 +86,37 @@ enum side_type { SIDE_TYPE_VLA_POINTER32, SIDE_TYPE_VLA_POINTER64, - /* Enumeration types */ + /* Statically declared enumeration types */ SIDE_TYPE_ENUM, SIDE_TYPE_ENUM_BITMAP, - /* Dynamic type */ SIDE_TYPE_DYNAMIC, -}; - -enum side_dynamic_type { - /* Basic types */ - SIDE_DYNAMIC_TYPE_NULL, - SIDE_DYNAMIC_TYPE_BOOL, - SIDE_DYNAMIC_TYPE_U8, - SIDE_DYNAMIC_TYPE_U16, - SIDE_DYNAMIC_TYPE_U32, - SIDE_DYNAMIC_TYPE_U64, - SIDE_DYNAMIC_TYPE_S8, - SIDE_DYNAMIC_TYPE_S16, - SIDE_DYNAMIC_TYPE_S32, - SIDE_DYNAMIC_TYPE_S64, - SIDE_DYNAMIC_TYPE_BYTE, - SIDE_DYNAMIC_TYPE_POINTER32, - SIDE_DYNAMIC_TYPE_POINTER64, - SIDE_DYNAMIC_TYPE_FLOAT_BINARY16, - SIDE_DYNAMIC_TYPE_FLOAT_BINARY32, - SIDE_DYNAMIC_TYPE_FLOAT_BINARY64, - SIDE_DYNAMIC_TYPE_FLOAT_BINARY128, - SIDE_DYNAMIC_TYPE_STRING, - /* Compound types */ - SIDE_DYNAMIC_TYPE_STRUCT, - SIDE_DYNAMIC_TYPE_STRUCT_VISITOR, - SIDE_DYNAMIC_TYPE_VLA, - SIDE_DYNAMIC_TYPE_VLA_VISITOR, + /* Dynamic types */ + SIDE_TYPE_DYNAMIC_NULL, + SIDE_TYPE_DYNAMIC_BOOL, + SIDE_TYPE_DYNAMIC_U8, + SIDE_TYPE_DYNAMIC_U16, + SIDE_TYPE_DYNAMIC_U32, + SIDE_TYPE_DYNAMIC_U64, + SIDE_TYPE_DYNAMIC_S8, + SIDE_TYPE_DYNAMIC_S16, + SIDE_TYPE_DYNAMIC_S32, + SIDE_TYPE_DYNAMIC_S64, + SIDE_TYPE_DYNAMIC_BYTE, + SIDE_TYPE_DYNAMIC_POINTER32, + SIDE_TYPE_DYNAMIC_POINTER64, + SIDE_TYPE_DYNAMIC_FLOAT_BINARY16, + SIDE_TYPE_DYNAMIC_FLOAT_BINARY32, + SIDE_TYPE_DYNAMIC_FLOAT_BINARY64, + SIDE_TYPE_DYNAMIC_FLOAT_BINARY128, + SIDE_TYPE_DYNAMIC_STRING, + + /* Dynamic compound types */ + SIDE_TYPE_DYNAMIC_STRUCT, + SIDE_TYPE_DYNAMIC_STRUCT_VISITOR, + SIDE_TYPE_DYNAMIC_VLA, + SIDE_TYPE_DYNAMIC_VLA_VISITOR, }; enum side_attr_type { @@ -142,7 +139,7 @@ enum side_attr_type { SIDE_ATTR_TYPE_STRING, }; -enum side_type_sg { +enum side_type_label_sg { SIDE_TYPE_SG_NULL, SIDE_TYPE_SG_UNSIGNED_INT, SIDE_TYPE_SG_SIGNED_INT, @@ -173,7 +170,7 @@ enum side_error { SIDE_ERROR_EXITING = 5, }; -enum side_type_byte_order { +enum side_type_label_byte_order { SIDE_TYPE_BYTE_ORDER_LE = 0, SIDE_TYPE_BYTE_ORDER_BE = 1, }; @@ -258,11 +255,6 @@ struct side_type_byte { uint32_t nr_attr; } SIDE_PACKED; -struct side_type_dynamic { - const struct side_attr *attr; - uint32_t nr_attr; -} SIDE_PACKED; - struct side_type_string { const struct side_attr *attr; uint32_t nr_attr; @@ -274,13 +266,13 @@ struct side_type_integer { uint16_t integer_size_bits; /* bits */ uint16_t len_bits; /* bits */ uint8_t signedness; /* true/false */ - uint8_t byte_order; /* enum side_type_byte_order */ + uint8_t byte_order; /* enum side_type_label_byte_order */ } SIDE_PACKED; struct side_type_float { const struct side_attr *attr; uint32_t nr_attr; - uint32_t byte_order; /* enum side_type_byte_order */ + uint32_t byte_order; /* enum side_type_label_byte_order */ uint16_t float_size_bits; /* bits */ } SIDE_PACKED; @@ -319,7 +311,7 @@ struct side_type_struct { struct side_type_sg_description { uint64_t offset; /* bytes */ - uint32_t type; /* enum side_type_sg */ + uint32_t type; /* enum side_type_label_sg */ union { struct side_type_null side_null; struct { @@ -342,32 +334,32 @@ struct side_type_struct_sg { const struct side_attr *attr; } SIDE_PACKED; -struct side_type_description { - uint32_t type; /* enum side_type */ +/* Statically defined types. */ +struct side_type { + uint32_t type; /* enum side_type_label */ union { /* Basic types */ struct side_type_null side_null; struct side_type_bool side_bool; struct side_type_byte side_byte; - struct side_type_dynamic side_dynamic; struct side_type_string side_string; struct side_type_integer side_integer; struct side_type_float side_float; /* Compound types */ struct { - const struct side_type_description *elem_type; + const struct side_type *elem_type; const struct side_attr *attr; uint32_t length; uint32_t nr_attr; } SIDE_PACKED side_array; struct { - const struct side_type_description *elem_type; + const struct side_type *elem_type; const struct side_attr *attr; uint32_t nr_attr; } SIDE_PACKED side_vla; struct { - const struct side_type_description *elem_type; + const struct side_type *elem_type; side_visitor visitor; const struct side_attr *attr; uint32_t nr_attr; @@ -378,18 +370,18 @@ struct side_type_description { /* Enumeration types */ struct { const struct side_enum_mappings *mappings; - const struct side_type_description *elem_type; + const struct side_type *elem_type; } SIDE_PACKED side_enum; struct { const struct side_enum_bitmap_mappings *mappings; - const struct side_type_description *elem_type; + const struct side_type *elem_type; } SIDE_PACKED side_enum_bitmap; } SIDE_PACKED u; } SIDE_PACKED; struct side_event_field { const char *field_name; - struct side_type_description side_type; + struct side_type side_type; } SIDE_PACKED; enum side_event_flags { @@ -399,16 +391,96 @@ enum side_event_flags { struct side_callback { union { void (*call)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, void *priv); void (*call_variadic)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, const struct side_arg_dynamic_event_struct *var_struct, void *priv); } SIDE_PACKED u; void *priv; } SIDE_PACKED; +struct side_arg_static { + /* Basic types */ + uint8_t bool_value; + uint8_t byte_value; + uint64_t string_value; /* const char * */ + union side_integer_value integer_value; + union side_float_value float_value; + + /* Compound types */ + const struct side_arg_vec *side_struct; + const struct side_arg_vec *side_array; + const struct side_arg_vec *side_vla; + void *side_vla_app_visitor_ctx; + void *side_array_fixint; + struct { + void *p; + uint32_t length; + } SIDE_PACKED side_vla_fixint; + void *side_struct_sg_ptr; +} SIDE_PACKED; + +struct side_arg_dynamic { + /* Basic types */ + struct side_type_null side_null; + struct { + struct side_type_bool type; + uint8_t value; + } SIDE_PACKED side_bool; + + struct { + struct side_type_byte type; + uint8_t value; + } SIDE_PACKED side_byte; + + struct { + struct side_type_string type; + uint64_t value; /* const char * */ + } SIDE_PACKED side_string; + + /* Integer type */ + struct { + struct side_type_integer type; + union side_integer_value value; + } SIDE_PACKED side_integer; + + struct { + struct side_type_float type; + union side_float_value value; + } SIDE_PACKED side_float; + + /* Compound types */ + const struct side_arg_dynamic_event_struct *side_dynamic_struct; + struct { + void *app_ctx; + side_dynamic_struct_visitor visitor; + const struct side_attr *attr; + uint32_t nr_attr; + } SIDE_PACKED side_dynamic_struct_visitor; + const struct side_arg_dynamic_vla *side_dynamic_vla; + struct { + void *app_ctx; + side_dynamic_vla_visitor visitor; + const struct side_attr *attr; + uint32_t nr_attr; + } SIDE_PACKED side_dynamic_vla_visitor; +} SIDE_PACKED; + +struct side_arg { + enum side_type_label type; + union { + struct side_arg_static side_static; + struct side_arg_dynamic side_dynamic; + } SIDE_PACKED u; +} SIDE_PACKED; + +struct side_arg_vec { + const struct side_arg *sav; + uint32_t len; +} SIDE_PACKED; + struct side_event_description { uintptr_t *enabled; const char *provider_name; @@ -424,58 +496,8 @@ struct side_event_description { uint32_t nr_callbacks; } SIDE_PACKED; -struct side_arg_dynamic_vec { - uint32_t dynamic_type; /* enum side_dynamic_type */ - union { - struct side_type_null side_null; - - /* Basic types */ - struct { - struct side_type_bool type; - uint8_t value; - } SIDE_PACKED side_bool; - - struct { - struct side_type_byte type; - uint8_t value; - } SIDE_PACKED side_byte; - - struct { - struct side_type_string type; - uint64_t value; /* const char * */ - } SIDE_PACKED side_string; - - /* Integer type */ - struct { - struct side_type_integer type; - union side_integer_value value; - } SIDE_PACKED side_integer; - - struct { - struct side_type_float type; - union side_float_value value; - } SIDE_PACKED side_float; - - /* Compound types */ - const struct side_arg_dynamic_event_struct *side_dynamic_struct; - struct { - void *app_ctx; - side_dynamic_struct_visitor visitor; - const struct side_attr *attr; - uint32_t nr_attr; - } SIDE_PACKED side_dynamic_struct_visitor; - const struct side_arg_dynamic_vec_vla *side_dynamic_vla; - struct { - void *app_ctx; - side_dynamic_vla_visitor visitor; - const struct side_attr *attr; - uint32_t nr_attr; - } SIDE_PACKED side_dynamic_vla_visitor; - } SIDE_PACKED u; -} SIDE_PACKED; - -struct side_arg_dynamic_vec_vla { - const struct side_arg_dynamic_vec *sav; +struct side_arg_dynamic_vla { + const struct side_arg *sav; const struct side_attr *attr; uint32_t len; uint32_t nr_attr; @@ -483,7 +505,7 @@ struct side_arg_dynamic_vec_vla { struct side_arg_dynamic_event_field { const char *field_name; - const struct side_arg_dynamic_vec elem; + const struct side_arg elem; } SIDE_PACKED; struct side_arg_dynamic_event_struct { @@ -493,43 +515,11 @@ struct side_arg_dynamic_event_struct { uint32_t nr_attr; } SIDE_PACKED; -struct side_arg_vec { - enum side_type type; - union { - /* Basic types */ - uint8_t bool_value; - uint8_t byte_value; - uint64_t string_value; /* const char * */ - union side_integer_value integer_value; - union side_float_value float_value; - - /* Compound types */ - const struct side_arg_vec_description *side_struct; - const struct side_arg_vec_description *side_array; - const struct side_arg_vec_description *side_vla; - void *side_vla_app_visitor_ctx; - void *side_array_fixint; - struct { - void *p; - uint32_t length; - } SIDE_PACKED side_vla_fixint; - void *side_struct_sg_ptr; - - /* Dynamic type */ - struct side_arg_dynamic_vec dynamic_value; - } SIDE_PACKED u; -} SIDE_PACKED; - -struct side_arg_vec_description { - const struct side_arg_vec *sav; - uint32_t len; -} SIDE_PACKED; - /* The visitor pattern is a double-dispatch visitor. */ struct side_tracer_visitor_ctx { enum side_visitor_status (*write_elem)( const struct side_tracer_visitor_ctx *tracer_ctx, - const struct side_arg_vec *elem); + const struct side_arg *elem); void *priv; /* Private tracer context. */ } SIDE_PACKED; @@ -543,7 +533,7 @@ struct side_tracer_dynamic_struct_visitor_ctx { struct side_tracer_dynamic_vla_visitor_ctx { enum side_visitor_status (*write_elem)( const struct side_tracer_dynamic_vla_visitor_ctx *tracer_ctx, - const struct side_arg_dynamic_vec *elem); + const struct side_arg *elem); void *priv; /* Private tracer context. */ } SIDE_PACKED; @@ -553,14 +543,14 @@ struct side_tracer_dynamic_vla_visitor_ctx { # define SIDE_TYPE_POINTER_HOST SIDE_TYPE_POINTER64 # define SIDE_TYPE_ARRAY_POINTER_HOST SIDE_TYPE_ARRAY_POINTER64 # define SIDE_TYPE_VLA_POINTER_HOST SIDE_TYPE_VLA_POINTER64 -# define SIDE_DYNAMIC_TYPE_POINTER_HOST SIDE_DYNAMIC_TYPE_POINTER64 +# define SIDE_TYPE_DYNAMIC_POINTER_HOST SIDE_TYPE_DYNAMIC_POINTER64 # define SIDE_ATTR_TYPE_POINTER_HOST SIDE_ATTR_TYPE_POINTER64 # define SIDE_PTR_HOST .side_u64 #else # define SIDE_TYPE_POINTER_HOST SIDE_TYPE_POINTER32 # define SIDE_TYPE_ARRAY_POINTER_HOST SIDE_TYPE_ARRAY_POINTER32 # define SIDE_TYPE_VLA_POINTER_HOST SIDE_TYPE_VLA_POINTER32 -# define SIDE_DYNAMIC_TYPE_POINTER_HOST SIDE_DYNAMIC_TYPE_POINTER32 +# define SIDE_TYPE_DYNAMIC_POINTER_HOST SIDE_TYPE_DYNAMIC_POINTER32 # define SIDE_ATTR_TYPE_POINTER_HOST SIDE_ATTR_TYPE_POINTER32 # define SIDE_PTR_HOST .side_u32 #endif @@ -637,15 +627,9 @@ struct side_tracer_dynamic_vla_visitor_ctx { }, \ } -#define side_type_dynamic(_attr) \ +#define side_type_dynamic() \ { \ .type = SIDE_TYPE_DYNAMIC, \ - .u = { \ - .side_dynamic = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - }, \ - }, \ } #define _side_type_integer(_type, _signedness, _byte_order, _integer_size_bits, _len_bits, _attr) \ @@ -715,7 +699,7 @@ struct side_tracer_dynamic_vla_visitor_ctx { #define side_field_float_binary64(_name, _attr) _side_field(_name, side_type_float_binary64(SIDE_PARAM(_attr))) #define side_field_float_binary128(_name, _attr) _side_field(_name, side_type_float_binary128(SIDE_PARAM(_attr))) #define side_field_string(_name, _attr) _side_field(_name, side_type_string(SIDE_PARAM(_attr))) -#define side_field_dynamic(_name, _attr) _side_field(_name, side_type_dynamic(SIDE_PARAM(_attr))) +#define side_field_dynamic(_name) _side_field(_name, side_type_dynamic()) /* Little endian */ #define side_type_u16_le(_attr) _side_type_integer(SIDE_TYPE_U16, false, SIDE_TYPE_BYTE_ORDER_LE, 16, 16, SIDE_PARAM(_attr)) @@ -944,7 +928,7 @@ struct side_tracer_dynamic_vla_visitor_ctx { _side_field(_name, side_type_vla_visitor(SIDE_PARAM(_elem_type), _visitor, SIDE_PARAM(_attr))) #define side_elem(...) \ - SIDE_COMPOUND_LITERAL(const struct side_type_description, __VA_ARGS__) + SIDE_COMPOUND_LITERAL(const struct side_type, __VA_ARGS__) #define side_field_list(...) \ SIDE_COMPOUND_LITERAL(const struct side_event_field, __VA_ARGS__) @@ -955,182 +939,193 @@ struct side_tracer_dynamic_vla_visitor_ctx { /* Static field arguments */ #define side_arg_null(_val) { .type = SIDE_TYPE_NULL } -#define side_arg_bool(_val) { .type = SIDE_TYPE_BOOL, .u = { .bool_value = !!(_val) } } -#define side_arg_byte(_val) { .type = SIDE_TYPE_BYTE, .u = { .byte_value = (_val) } } -#define side_arg_string(_val) { .type = SIDE_TYPE_STRING, .u = { .string_value = (uintptr_t) (_val) } } -#define side_arg_dynamic(_dynamic_arg_type) { .type = SIDE_TYPE_DYNAMIC, .u = { .dynamic_value = _dynamic_arg_type } } - -#define side_arg_u8(_val) { .type = SIDE_TYPE_U8, .u = { .integer_value = { .side_u8 = (_val) } } } -#define side_arg_u16(_val) { .type = SIDE_TYPE_U16, .u = { .integer_value = { .side_u16 = (_val) } } } -#define side_arg_u32(_val) { .type = SIDE_TYPE_U32, .u = { .integer_value = { .side_u32 = (_val) } } } -#define side_arg_u64(_val) { .type = SIDE_TYPE_U64, .u = { .integer_value = { .side_u64 = (_val) } } } -#define side_arg_s8(_val) { .type = SIDE_TYPE_S8, .u = { .integer_value = { .side_s8 = (_val) } } } -#define side_arg_s16(_val) { .type = SIDE_TYPE_S16, .u = { .integer_value = { .side_s16 = (_val) } } } -#define side_arg_s32(_val) { .type = SIDE_TYPE_S32, .u = { .integer_value = { .side_s32 = (_val) } } } -#define side_arg_s64(_val) { .type = SIDE_TYPE_S64, .u = { .integer_value = { .side_s64 = (_val) } } } -#define side_arg_pointer(_val) { .type = SIDE_TYPE_POINTER_HOST, .u = { .integer_value = { SIDE_PTR_HOST = (uintptr_t) (_val) } } } -#define side_arg_enum_bitmap8(_val) { .type = SIDE_TYPE_ENUM_BITMAP8, .u = { .integer_value = { .side_u8 = (_val) } } } -#define side_arg_enum_bitmap16(_val) { .type = SIDE_TYPE_ENUM_BITMAP16, .u = { .integer_value = { .side_u16 = (_val) } } } -#define side_arg_enum_bitmap32(_val) { .type = SIDE_TYPE_ENUM_BITMAP32, .u = { .integer_value = { .side_u32 = (_val) } } } -#define side_arg_enum_bitmap64(_val) { .type = SIDE_TYPE_ENUM_BITMAP64, .u = { .integer_value = { .side_u64 = (_val) } } } -#define side_arg_enum_bitmap_array(_side_type) { .type = SIDE_TYPE_ENUM_BITMAP_ARRAY, .u = { .side_array = (_side_type) } } -#define side_arg_enum_bitmap_vla(_side_type) { .type = SIDE_TYPE_ENUM_BITMAP_VLA, .u = { .side_vla = (_side_type) } } -#define side_arg_float_binary16(_val) { .type = SIDE_TYPE_FLOAT_BINARY16, .u = { .float_value = { .side_float_binary16 = (_val) } } } -#define side_arg_float_binary32(_val) { .type = SIDE_TYPE_FLOAT_BINARY32, .u = { .float_value = { .side_float_binary32 = (_val) } } } -#define side_arg_float_binary64(_val) { .type = SIDE_TYPE_FLOAT_BINARY64, .u = { .float_value = { .side_float_binary64 = (_val) } } } -#define side_arg_float_binary128(_val) { .type = SIDE_TYPE_FLOAT_BINARY128, .u = { .float_value = { .side_float_binary128 = (_val) } } } - -#define side_arg_struct(_side_type) { .type = SIDE_TYPE_STRUCT, .u = { .side_struct = (_side_type) } } -#define side_arg_struct_sg(_ptr) { .type = SIDE_TYPE_STRUCT_SG, .u = { .side_struct_sg_ptr = (_ptr) } } -#define side_arg_array(_side_type) { .type = SIDE_TYPE_ARRAY, .u = { .side_array = (_side_type) } } -#define side_arg_vla(_side_type) { .type = SIDE_TYPE_VLA, .u = { .side_vla = (_side_type) } } -#define side_arg_vla_visitor(_ctx) { .type = SIDE_TYPE_VLA_VISITOR, .u = { .side_vla_app_visitor_ctx = (_ctx) } } - -#define side_arg_array_u8(_ptr) { .type = SIDE_TYPE_ARRAY_U8, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_u16(_ptr) { .type = SIDE_TYPE_ARRAY_U16, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_u32(_ptr) { .type = SIDE_TYPE_ARRAY_U32, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_u64(_ptr) { .type = SIDE_TYPE_ARRAY_U64, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_s8(_ptr) { .type = SIDE_TYPE_ARRAY_S8, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_s16(_ptr) { .type = SIDE_TYPE_ARRAY_S16, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_s32(_ptr) { .type = SIDE_TYPE_ARRAY_S32, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_s64(_ptr) { .type = SIDE_TYPE_ARRAY_S64, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_byte(_ptr) { .type = SIDE_TYPE_ARRAY_BYTE, .u = { .side_array_fixint = (_ptr) } } -#define side_arg_array_pointer(_ptr) { .type = SIDE_TYPE_ARRAY_POINTER_HOST, .u = { .side_array_fixint = (_ptr) } } - -#define side_arg_vla_u8(_ptr, _length) { .type = SIDE_TYPE_VLA_U8, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } -#define side_arg_vla_u16(_ptr, _length) { .type = SIDE_TYPE_VLA_U16, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_u32(_ptr, _length) { .type = SIDE_TYPE_VLA_U32, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_u64(_ptr, _length) { .type = SIDE_TYPE_VLA_U64, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_s8(_ptr, _length) { .type = SIDE_TYPE_VLA_S8, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_s16(_ptr, _length) { .type = SIDE_TYPE_VLA_S16, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_s32(_ptr, _length) { .type = SIDE_TYPE_VLA_S32, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_s64(_ptr, _length) { .type = SIDE_TYPE_VLA_S64, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_byte(_ptr, _length) { .type = SIDE_TYPE_VLA_BYTE, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } -#define side_arg_vla_pointer(_ptr, _length) { .type = SIDE_TYPE_VLA_POINTER_HOST, .u = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } +#define side_arg_bool(_val) { .type = SIDE_TYPE_BOOL, .u = { .side_static = { .bool_value = !!(_val) } } } +#define side_arg_byte(_val) { .type = SIDE_TYPE_BYTE, .u = { .side_static = { .byte_value = (_val) } } } +#define side_arg_string(_val) { .type = SIDE_TYPE_STRING, .u = { .side_static = { .string_value = (uintptr_t) (_val) } } } + +#define side_arg_u8(_val) { .type = SIDE_TYPE_U8, .u = { .side_static = { .integer_value = { .side_u8 = (_val) } } } } +#define side_arg_u16(_val) { .type = SIDE_TYPE_U16, .u = { .side_static = { .integer_value = { .side_u16 = (_val) } } } } +#define side_arg_u32(_val) { .type = SIDE_TYPE_U32, .u = { .side_static = { .integer_value = { .side_u32 = (_val) } } } } +#define side_arg_u64(_val) { .type = SIDE_TYPE_U64, .u = { .side_static = { .integer_value = { .side_u64 = (_val) } } } } +#define side_arg_s8(_val) { .type = SIDE_TYPE_S8, .u = { .side_static = { .integer_value = { .side_s8 = (_val) } } } } +#define side_arg_s16(_val) { .type = SIDE_TYPE_S16, .u = { .side_static = { .integer_value = { .side_s16 = (_val) } } } } +#define side_arg_s32(_val) { .type = SIDE_TYPE_S32, .u = { .side_static = { .integer_value = { .side_s32 = (_val) } } } } +#define side_arg_s64(_val) { .type = SIDE_TYPE_S64, .u = { .side_static = { .integer_value = { .side_s64 = (_val) } } } } +#define side_arg_pointer(_val) { .type = SIDE_TYPE_POINTER_HOST, .u = { .side_static = { .integer_value = { SIDE_PTR_HOST = (uintptr_t) (_val) } } } } +#define side_arg_enum_bitmap8(_val) { .type = SIDE_TYPE_ENUM_BITMAP8, .u = { .side_static = { .integer_value = { .side_u8 = (_val) } } } } +#define side_arg_enum_bitmap16(_val) { .type = SIDE_TYPE_ENUM_BITMAP16, .u = { .side_static = { .integer_value = { .side_u16 = (_val) } } } } +#define side_arg_enum_bitmap32(_val) { .type = SIDE_TYPE_ENUM_BITMAP32, .u = { .side_static = { .integer_value = { .side_u32 = (_val) } } } } +#define side_arg_enum_bitmap64(_val) { .type = SIDE_TYPE_ENUM_BITMAP64, .u = { .side_static = { .integer_value = { .side_u64 = (_val) } } } } +#define side_arg_enum_bitmap_array(_side_type) { .type = SIDE_TYPE_ENUM_BITMAP_ARRAY, .u = { .side_static = { .side_array = (_side_type) } } } +#define side_arg_enum_bitmap_vla(_side_type) { .type = SIDE_TYPE_ENUM_BITMAP_VLA, .u = { .side_static = { .side_vla = (_side_type) } } } +#define side_arg_float_binary16(_val) { .type = SIDE_TYPE_FLOAT_BINARY16, .u = { .side_static = { .float_value = { .side_float_binary16 = (_val) } } } } +#define side_arg_float_binary32(_val) { .type = SIDE_TYPE_FLOAT_BINARY32, .u = { .side_static = { .float_value = { .side_float_binary32 = (_val) } } } } +#define side_arg_float_binary64(_val) { .type = SIDE_TYPE_FLOAT_BINARY64, .u = { .side_static = { .float_value = { .side_float_binary64 = (_val) } } } } +#define side_arg_float_binary128(_val) { .type = SIDE_TYPE_FLOAT_BINARY128, .u = { .side_static = { .float_value = { .side_float_binary128 = (_val) } } } } + +#define side_arg_struct(_side_type) { .type = SIDE_TYPE_STRUCT, .u = { .side_static = { .side_struct = (_side_type) } } } +#define side_arg_struct_sg(_ptr) { .type = SIDE_TYPE_STRUCT_SG, .u = { .side_static = { .side_struct_sg_ptr = (_ptr) } } } +#define side_arg_array(_side_type) { .type = SIDE_TYPE_ARRAY, .u = { .side_static = { .side_array = (_side_type) } } } +#define side_arg_vla(_side_type) { .type = SIDE_TYPE_VLA, .u = { .side_static = { .side_vla = (_side_type) } } } +#define side_arg_vla_visitor(_ctx) { .type = SIDE_TYPE_VLA_VISITOR, .u = { .side_static = { .side_vla_app_visitor_ctx = (_ctx) } } } + +#define side_arg_array_u8(_ptr) { .type = SIDE_TYPE_ARRAY_U8, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_u16(_ptr) { .type = SIDE_TYPE_ARRAY_U16, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_u32(_ptr) { .type = SIDE_TYPE_ARRAY_U32, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_u64(_ptr) { .type = SIDE_TYPE_ARRAY_U64, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_s8(_ptr) { .type = SIDE_TYPE_ARRAY_S8, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_s16(_ptr) { .type = SIDE_TYPE_ARRAY_S16, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_s32(_ptr) { .type = SIDE_TYPE_ARRAY_S32, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_s64(_ptr) { .type = SIDE_TYPE_ARRAY_S64, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_byte(_ptr) { .type = SIDE_TYPE_ARRAY_BYTE, .u = { .side_static = { .side_array_fixint = (_ptr) } } } +#define side_arg_array_pointer(_ptr) { .type = SIDE_TYPE_ARRAY_POINTER_HOST, .u = { .side_static = { .side_array_fixint = (_ptr) } } } + +#define side_arg_vla_u8(_ptr, _length) { .type = SIDE_TYPE_VLA_U8, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } +#define side_arg_vla_u16(_ptr, _length) { .type = SIDE_TYPE_VLA_U16, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_u32(_ptr, _length) { .type = SIDE_TYPE_VLA_U32, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_u64(_ptr, _length) { .type = SIDE_TYPE_VLA_U64, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_s8(_ptr, _length) { .type = SIDE_TYPE_VLA_S8, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_s16(_ptr, _length) { .type = SIDE_TYPE_VLA_S16, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_s32(_ptr, _length) { .type = SIDE_TYPE_VLA_S32, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_s64(_ptr, _length) { .type = SIDE_TYPE_VLA_S64, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_byte(_ptr, _length) { .type = SIDE_TYPE_VLA_BYTE, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } +#define side_arg_vla_pointer(_ptr, _length) { .type = SIDE_TYPE_VLA_POINTER_HOST, .u = { .side_static = { .side_vla_fixint = { .p = (_ptr), .length = (_length) } } } } /* Dynamic field arguments */ #define side_arg_dynamic_null(_attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_NULL, \ + .type = SIDE_TYPE_DYNAMIC_NULL, \ .u = { \ - .side_null = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .side_dynamic = { \ + .side_null = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ }, \ }, \ } #define side_arg_dynamic_bool(_val, _attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_BOOL, \ + .type = SIDE_TYPE_DYNAMIC_BOOL, \ .u = { \ - .side_bool = { \ - .type = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .side_dynamic = { \ + .side_bool = { \ + .type = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ + .value = !!(_val), \ }, \ - .value = !!(_val), \ }, \ }, \ } #define side_arg_dynamic_byte(_val, _attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_BYTE, \ + .type = SIDE_TYPE_DYNAMIC_BYTE, \ .u = { \ - .side_byte = { \ - .type = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .side_dynamic = { \ + .side_byte = { \ + .type = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ + .value = (_val), \ }, \ - .value = (_val), \ }, \ }, \ } #define side_arg_dynamic_string(_val, _attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_STRING, \ + .type = SIDE_TYPE_DYNAMIC_STRING, \ .u = { \ - .side_string = { \ - .type = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .side_dynamic = { \ + .side_string = { \ + .type = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ + .value = (uintptr_t) (_val), \ }, \ - .value = (uintptr_t) (_val), \ }, \ }, \ } #define _side_arg_dynamic_integer(_field, _val, _type, _signedness, _byte_order, _integer_size_bits, _len_bits, _attr) \ { \ - .dynamic_type = _type, \ + .type = _type, \ .u = { \ - .side_integer = { \ - .type = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .integer_size_bits = _integer_size_bits, \ - .len_bits = _len_bits, \ - .signedness = _signedness, \ - .byte_order = _byte_order, \ - }, \ - .value = { \ - _field = (_val), \ + .side_dynamic = { \ + .side_integer = { \ + .type = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .integer_size_bits = _integer_size_bits, \ + .len_bits = _len_bits, \ + .signedness = _signedness, \ + .byte_order = _byte_order, \ + }, \ + .value = { \ + _field = (_val), \ + }, \ }, \ }, \ }, \ } #define side_arg_dynamic_u8(_val, _attr) \ - _side_arg_dynamic_integer(.side_u8, _val, SIDE_DYNAMIC_TYPE_U8, false, SIDE_TYPE_BYTE_ORDER_HOST, 8, 8, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_u8, _val, SIDE_TYPE_DYNAMIC_U8, false, SIDE_TYPE_BYTE_ORDER_HOST, 8, 8, SIDE_PARAM(_attr)) #define side_arg_dynamic_s8(_val, _attr) \ - _side_arg_dynamic_integer(.side_s8, _val, SIDE_DYNAMIC_TYPE_S8, true, SIDE_TYPE_BYTE_ORDER_HOST, 8, 8, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_s8, _val, SIDE_TYPE_DYNAMIC_S8, true, SIDE_TYPE_BYTE_ORDER_HOST, 8, 8, SIDE_PARAM(_attr)) #define _side_arg_dynamic_u16(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(.side_u16, _val, SIDE_DYNAMIC_TYPE_U16, false, _byte_order, 16, 16, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_u16, _val, SIDE_TYPE_DYNAMIC_U16, false, _byte_order, 16, 16, SIDE_PARAM(_attr)) #define _side_arg_dynamic_u32(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(.side_u32, _val, SIDE_DYNAMIC_TYPE_U32, false, _byte_order, 32, 32, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_u32, _val, SIDE_TYPE_DYNAMIC_U32, false, _byte_order, 32, 32, SIDE_PARAM(_attr)) #define _side_arg_dynamic_u64(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(.side_u64, _val, SIDE_DYNAMIC_TYPE_U64, false, _byte_order, 64, 64, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_u64, _val, SIDE_TYPE_DYNAMIC_U64, false, _byte_order, 64, 64, SIDE_PARAM(_attr)) #define _side_arg_dynamic_s16(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(.side_s16, _val, SIDE_DYNAMIC_TYPE_S16, true, _byte_order, 16, 16, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_s16, _val, SIDE_TYPE_DYNAMIC_S16, true, _byte_order, 16, 16, SIDE_PARAM(_attr)) #define _side_arg_dynamic_s32(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(.side_s32, _val, SIDE_DYNAMIC_TYPE_S32, true, _byte_order, 32, 32, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_s32, _val, SIDE_TYPE_DYNAMIC_S32, true, _byte_order, 32, 32, SIDE_PARAM(_attr)) #define _side_arg_dynamic_s64(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(.side_s64, _val, SIDE_DYNAMIC_TYPE_S64, true, _byte_order, 64, 64, SIDE_PARAM(_attr)) + _side_arg_dynamic_integer(.side_s64, _val, SIDE_TYPE_DYNAMIC_S64, true, _byte_order, 64, 64, SIDE_PARAM(_attr)) #define _side_arg_dynamic_pointer(_val, _byte_order, _attr) \ - _side_arg_dynamic_integer(SIDE_PTR_HOST, (uintptr_t) (_val), SIDE_DYNAMIC_TYPE_POINTER_HOST, false, _byte_order, \ + _side_arg_dynamic_integer(SIDE_PTR_HOST, (uintptr_t) (_val), SIDE_TYPE_DYNAMIC_POINTER_HOST, false, _byte_order, \ SIDE_BITS_PER_LONG, SIDE_BITS_PER_LONG, SIDE_PARAM(_attr)) #define _side_arg_dynamic_float(_field, _val, _type, _byte_order, _float_size_bits, _attr) \ { \ - .dynamic_type = _type, \ + .type = _type, \ .u = { \ - .side_float = { \ - .type = { \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ - .byte_order = _byte_order, \ - .float_size_bits = _float_size_bits, \ - }, \ - .value = { \ - _field = (_val), \ + .side_dynamic = { \ + .side_float = { \ + .type = { \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .byte_order = _byte_order, \ + .float_size_bits = _float_size_bits, \ + }, \ + .value = { \ + _field = (_val), \ + }, \ }, \ }, \ }, \ } #define _side_arg_dynamic_float_binary16(_val, _byte_order, _attr) \ - _side_arg_dynamic_float(.side_float_binary16, _val, SIDE_DYNAMIC_TYPE_FLOAT_BINARY16, _byte_order, 16, SIDE_PARAM(_attr)) + _side_arg_dynamic_float(.side_float_binary16, _val, SIDE_TYPE_DYNAMIC_FLOAT_BINARY16, _byte_order, 16, SIDE_PARAM(_attr)) #define _side_arg_dynamic_float_binary32(_val, _byte_order, _attr) \ - _side_arg_dynamic_float(.side_float_binary32, _val, SIDE_DYNAMIC_TYPE_FLOAT_BINARY32, _byte_order, 32, SIDE_PARAM(_attr)) + _side_arg_dynamic_float(.side_float_binary32, _val, SIDE_TYPE_DYNAMIC_FLOAT_BINARY32, _byte_order, 32, SIDE_PARAM(_attr)) #define _side_arg_dynamic_float_binary64(_val, _byte_order, _attr) \ - _side_arg_dynamic_float(.side_float_binary64, _val, SIDE_DYNAMIC_TYPE_FLOAT_BINARY64, _byte_order, 64, SIDE_PARAM(_attr)) + _side_arg_dynamic_float(.side_float_binary64, _val, SIDE_TYPE_DYNAMIC_FLOAT_BINARY64, _byte_order, 64, SIDE_PARAM(_attr)) #define _side_arg_dynamic_float_binary128(_val, _byte_order, _attr) \ - _side_arg_dynamic_float(.side_float_binary128, _val, SIDE_DYNAMIC_TYPE_FLOAT_BINARY128, _byte_order, 128, SIDE_PARAM(_attr)) + _side_arg_dynamic_float(.side_float_binary128, _val, SIDE_TYPE_DYNAMIC_FLOAT_BINARY128, _byte_order, 128, SIDE_PARAM(_attr)) /* Host endian */ #define side_arg_dynamic_u16(_val, _attr) _side_arg_dynamic_u16(_val, SIDE_TYPE_BYTE_ORDER_HOST, SIDE_PARAM(_attr)) @@ -1173,49 +1168,57 @@ struct side_tracer_dynamic_vla_visitor_ctx { #define side_arg_dynamic_vla(_vla) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_VLA, \ + .type = SIDE_TYPE_DYNAMIC_VLA, \ .u = { \ - .side_dynamic_vla = (_vla), \ + .side_dynamic = { \ + .side_dynamic_vla = (_vla), \ + }, \ }, \ } #define side_arg_dynamic_vla_visitor(_dynamic_vla_visitor, _ctx, _attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_VLA_VISITOR, \ + .type = SIDE_TYPE_DYNAMIC_VLA_VISITOR, \ .u = { \ - .side_dynamic_vla_visitor = { \ - .app_ctx = _ctx, \ - .visitor = _dynamic_vla_visitor, \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .side_dynamic = { \ + .side_dynamic_vla_visitor = { \ + .app_ctx = _ctx, \ + .visitor = _dynamic_vla_visitor, \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ }, \ }, \ } #define side_arg_dynamic_struct(_struct) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_STRUCT, \ + .type = SIDE_TYPE_DYNAMIC_STRUCT, \ .u = { \ - .side_dynamic_struct = (_struct), \ + .side_dynamic = { \ + .side_dynamic_struct = (_struct), \ + }, \ }, \ } #define side_arg_dynamic_struct_visitor(_dynamic_struct_visitor, _ctx, _attr) \ { \ - .dynamic_type = SIDE_DYNAMIC_TYPE_STRUCT_VISITOR, \ + .type = SIDE_TYPE_DYNAMIC_STRUCT_VISITOR, \ .u = { \ - .side_dynamic_struct_visitor = { \ - .app_ctx = _ctx, \ - .visitor = _dynamic_struct_visitor, \ - .attr = _attr, \ - .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + .side_dynamic = { \ + .side_dynamic_struct_visitor = { \ + .app_ctx = _ctx, \ + .visitor = _dynamic_struct_visitor, \ + .attr = _attr, \ + .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \ + }, \ }, \ }, \ } #define side_arg_dynamic_define_vec(_identifier, _sav, _attr) \ - const struct side_arg_dynamic_vec _identifier##_vec[] = { _sav }; \ - const struct side_arg_dynamic_vec_vla _identifier = { \ + const struct side_arg _identifier##_vec[] = { _sav }; \ + const struct side_arg_dynamic_vla _identifier = { \ .sav = _identifier##_vec, \ .attr = _attr, \ .len = SIDE_ARRAY_SIZE(_identifier##_vec), \ @@ -1232,8 +1235,8 @@ struct side_tracer_dynamic_vla_visitor_ctx { } #define side_arg_define_vec(_identifier, _sav) \ - const struct side_arg_vec _identifier##_vec[] = { _sav }; \ - const struct side_arg_vec_description _identifier = { \ + const struct side_arg _identifier##_vec[] = { _sav }; \ + const struct side_arg_vec _identifier = { \ .sav = _identifier##_vec, \ .len = SIDE_ARRAY_SIZE(_identifier##_vec), \ } @@ -1302,8 +1305,8 @@ struct side_tracer_dynamic_vla_visitor_ctx { #define side_event_call(_identifier, _sav) \ { \ - const struct side_arg_vec side_sav[] = { _sav }; \ - const struct side_arg_vec_description sav_desc = { \ + const struct side_arg side_sav[] = { _sav }; \ + const struct side_arg_vec sav_desc = { \ .sav = side_sav, \ .len = SIDE_ARRAY_SIZE(side_sav), \ }; \ @@ -1316,8 +1319,8 @@ struct side_tracer_dynamic_vla_visitor_ctx { #define side_event_call_variadic(_identifier, _sav, _var_fields, _attr) \ { \ - const struct side_arg_vec side_sav[] = { _sav }; \ - const struct side_arg_vec_description sav_desc = { \ + const struct side_arg side_sav[] = { _sav }; \ + const struct side_arg_vec sav_desc = { \ .sav = side_sav, \ .len = SIDE_ARRAY_SIZE(side_sav), \ }; \ @@ -1386,30 +1389,30 @@ struct side_tracer_dynamic_vla_visitor_ctx { extern const struct side_callback side_empty_callback; void side_call(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc); + const struct side_arg_vec *sav_desc); void side_call_variadic(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, const struct side_arg_dynamic_event_struct *var_struct); int side_tracer_callback_register(struct side_event_description *desc, void (*call)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, void *priv), void *priv); int side_tracer_callback_variadic_register(struct side_event_description *desc, void (*call_variadic)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, const struct side_arg_dynamic_event_struct *var_struct, void *priv), void *priv); int side_tracer_callback_unregister(struct side_event_description *desc, void (*call)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, void *priv), void *priv); int side_tracer_callback_variadic_unregister(struct side_event_description *desc, void (*call_variadic)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, const struct side_arg_dynamic_event_struct *var_struct, void *priv), void *priv); diff --git a/src/side.c b/src/side.c index b6f7dd5..f01a69f 100644 --- a/src/side.c +++ b/src/side.c @@ -66,7 +66,7 @@ const struct side_callback side_empty_callback; void side_init(void) __attribute__((constructor)); void side_exit(void) __attribute__((destructor)); -void side_call(const struct side_event_description *desc, const struct side_arg_vec_description *sav_desc) +void side_call(const struct side_event_description *desc, const struct side_arg_vec *sav_desc) { const struct side_callback *side_cb; unsigned int rcu_period; @@ -91,7 +91,7 @@ void side_call(const struct side_event_description *desc, const struct side_arg_ } void side_call_variadic(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, const struct side_arg_dynamic_event_struct *var_struct) { const struct side_callback *side_cb; @@ -183,7 +183,7 @@ unlock: int side_tracer_callback_register(struct side_event_description *desc, void (*call)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, void *priv), void *priv) { @@ -194,7 +194,7 @@ int side_tracer_callback_register(struct side_event_description *desc, int side_tracer_callback_variadic_register(struct side_event_description *desc, void (*call_variadic)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, const struct side_arg_dynamic_event_struct *var_struct, void *priv), void *priv) @@ -255,7 +255,7 @@ unlock: int side_tracer_callback_unregister(struct side_event_description *desc, void (*call)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, void *priv), void *priv) { @@ -266,7 +266,7 @@ int side_tracer_callback_unregister(struct side_event_description *desc, int side_tracer_callback_variadic_unregister(struct side_event_description *desc, void (*call_variadic)(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, const struct side_arg_dynamic_event_struct *var_struct, void *priv), void *priv) diff --git a/src/test.c b/src/test.c index 30b5424..63b1865 100644 --- a/src/test.c +++ b/src/test.c @@ -20,8 +20,8 @@ side_static_event(my_provider_event, "myprovider", "myevent", SIDE_LOGLEVEL_DEBU side_field_u32("abc", side_attr_list()), side_field_s64("def", side_attr_list()), side_field_pointer("ptr", side_attr_list()), - side_field_dynamic("dynamic", side_attr_list()), - side_field_dynamic("dynamic_pointer", side_attr_list()), + side_field_dynamic("dynamic"), + side_field_dynamic("dynamic_pointer"), side_field_null("null", side_attr_list()), ), side_attr_list() @@ -38,8 +38,8 @@ void test_fields(void) side_arg_u32(uw), side_arg_s64(sdw), side_arg_pointer((void *) 0x1), - side_arg_dynamic(side_arg_dynamic_string("zzz", side_attr_list())), - side_arg_dynamic(side_arg_dynamic_pointer((void *) 0x1, side_attr_list())), + side_arg_dynamic_string("zzz", side_attr_list()), + side_arg_dynamic_pointer((void *) 0x1, side_attr_list()), side_arg_null(), ) ); @@ -171,7 +171,7 @@ enum side_visitor_status test_visitor(const struct side_tracer_visitor_ctx *trac uint32_t length = ctx->length, i; for (i = 0; i < length; i++) { - const struct side_arg_vec elem = side_arg_u32(ctx->ptr[i]); + const struct side_arg elem = side_arg_u32(ctx->ptr[i]); if (tracer_ctx->write_elem(tracer_ctx, &elem) != SIDE_VISITOR_STATUS_OK) return SIDE_VISITOR_STATUS_ERROR; @@ -215,7 +215,7 @@ enum side_visitor_status test_inner_visitor(const struct side_tracer_visitor_ctx uint32_t length = ctx->length, i; for (i = 0; i < length; i++) { - const struct side_arg_vec elem = side_arg_u32(ctx->ptr[i]); + const struct side_arg elem = side_arg_u32(ctx->ptr[i]); if (tracer_ctx->write_elem(tracer_ctx, &elem) != SIDE_VISITOR_STATUS_OK) return SIDE_VISITOR_STATUS_ERROR; @@ -239,7 +239,7 @@ enum side_visitor_status test_outer_visitor(const struct side_tracer_visitor_ctx .ptr = ctx->ptr[i], .length = 2, }; - const struct side_arg_vec elem = side_arg_vla_visitor(&inner_ctx); + const struct side_arg elem = side_arg_vla_visitor(&inner_ctx); if (tracer_ctx->write_elem(tracer_ctx, &elem) != SIDE_VISITOR_STATUS_OK) return SIDE_VISITOR_STATUS_ERROR; } @@ -315,7 +315,7 @@ void test_vla_fixint(void) side_static_event(my_provider_event_dynamic_basic, "myprovider", "mydynamicbasic", SIDE_LOGLEVEL_DEBUG, side_field_list( - side_field_dynamic("dynamic", side_attr_list()), + side_field_dynamic("dynamic"), ), side_attr_list() ); @@ -324,13 +324,13 @@ static void test_dynamic_basic_type(void) { side_event(my_provider_event_dynamic_basic, - side_arg_list(side_arg_dynamic(side_arg_dynamic_s16(-33, side_attr_list())))); + side_arg_list(side_arg_dynamic_s16(-33, side_attr_list()))); } side_static_event(my_provider_event_dynamic_vla, "myprovider", "mydynamicvla", SIDE_LOGLEVEL_DEBUG, side_field_list( - side_field_dynamic("dynamic", side_attr_list()), + side_field_dynamic("dynamic"), ), side_attr_list() ); @@ -347,13 +347,13 @@ void test_dynamic_vla(void) side_attr_list() ); side_event(my_provider_event_dynamic_vla, - side_arg_list(side_arg_dynamic(side_arg_dynamic_vla(&myvla)))); + side_arg_list(side_arg_dynamic_vla(&myvla))); } side_static_event(my_provider_event_dynamic_null, "myprovider", "mydynamicnull", SIDE_LOGLEVEL_DEBUG, side_field_list( - side_field_dynamic("dynamic", side_attr_list()), + side_field_dynamic("dynamic"), ), side_attr_list() ); @@ -362,13 +362,13 @@ static void test_dynamic_null(void) { side_event(my_provider_event_dynamic_null, - side_arg_list(side_arg_dynamic(side_arg_dynamic_null(side_attr_list())))); + side_arg_list(side_arg_dynamic_null(side_attr_list()))); } side_static_event(my_provider_event_dynamic_struct, "myprovider", "mydynamicstruct", SIDE_LOGLEVEL_DEBUG, side_field_list( - side_field_dynamic("dynamic", side_attr_list()), + side_field_dynamic("dynamic"), ), side_attr_list() ); @@ -386,13 +386,13 @@ void test_dynamic_struct(void) ); side_event(my_provider_event_dynamic_struct, - side_arg_list(side_arg_dynamic(side_arg_dynamic_struct(&mystruct)))); + side_arg_list(side_arg_dynamic_struct(&mystruct))); } side_static_event(my_provider_event_dynamic_nested_struct, "myprovider", "mydynamicnestedstruct", SIDE_LOGLEVEL_DEBUG, side_field_list( - side_field_dynamic("dynamic", side_attr_list()), + side_field_dynamic("dynamic"), ), side_attr_list() ); @@ -422,13 +422,13 @@ void test_dynamic_nested_struct(void) side_attr_list() ); side_event(my_provider_event_dynamic_nested_struct, - side_arg_list(side_arg_dynamic(side_arg_dynamic_struct(&mystruct)))); + side_arg_list(side_arg_dynamic_struct(&mystruct))); } side_static_event(my_provider_event_dynamic_vla_struct, "myprovider", "mydynamicvlastruct", SIDE_LOGLEVEL_DEBUG, side_field_list( - side_field_dynamic("dynamic", side_attr_list()), + side_field_dynamic("dynamic"), ), side_attr_list() ); @@ -453,13 +453,13 @@ void test_dynamic_vla_struct(void) side_attr_list() ); side_event(my_provider_event_dynamic_vla_struct, - side_arg_list(side_arg_dynamic(side_arg_dynamic_vla(&myvla)))); + side_arg_list(side_arg_dynamic_vla(&myvla))); } side_static_event(my_provider_event_dynamic_struct_vla, "myprovider", "mydynamicstructvla", SIDE_LOGLEVEL_DEBUG, side_field_list( - side_field_dynamic("dynamic", side_attr_list()), + side_field_dynamic("dynamic"), ), side_attr_list() ); @@ -491,13 +491,13 @@ void test_dynamic_struct_vla(void) side_attr_list() ); side_event(my_provider_event_dynamic_struct_vla, - side_arg_list(side_arg_dynamic(side_arg_dynamic_struct(&mystruct)))); + side_arg_list(side_arg_dynamic_struct(&mystruct))); } side_static_event(my_provider_event_dynamic_nested_vla, "myprovider", "mydynamicnestedvla", SIDE_LOGLEVEL_DEBUG, side_field_list( - side_field_dynamic("dynamic", side_attr_list()), + side_field_dynamic("dynamic"), ), side_attr_list() ); @@ -529,7 +529,7 @@ void test_dynamic_nested_vla(void) side_attr_list() ); side_event(my_provider_event_dynamic_nested_vla, - side_arg_list(side_arg_dynamic(side_arg_dynamic_vla(&myvla)))); + side_arg_list(side_arg_dynamic_vla(&myvla))); } side_static_event_variadic(my_provider_event_variadic, @@ -637,7 +637,7 @@ void test_dynamic_bool(void) side_static_event(my_provider_event_dynamic_vla_visitor, "myprovider", "mydynamicvlavisitor", SIDE_LOGLEVEL_DEBUG, side_field_list( - side_field_dynamic("dynamic", side_attr_list()), + side_field_dynamic("dynamic"), ), side_attr_list() ); @@ -654,20 +654,22 @@ enum side_visitor_status test_dynamic_vla_visitor(const struct side_tracer_dynam uint32_t length = ctx->length, i; for (i = 0; i < length; i++) { - const struct side_arg_dynamic_vec elem = { - .dynamic_type = SIDE_DYNAMIC_TYPE_U32, + const struct side_arg elem = { + .type = SIDE_TYPE_DYNAMIC_U32, .u = { - .side_integer = { - .type = { - .attr = NULL, - .nr_attr = 0, - .integer_size_bits = 32, - .len_bits = 32, - .signedness = false, - .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, - }, - .value = { - .side_u32 = ctx->ptr[i], + .side_dynamic = { + .side_integer = { + .type = { + .attr = NULL, + .nr_attr = 0, + .integer_size_bits = 32, + .len_bits = 32, + .signedness = false, + .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, + }, + .value = { + .side_u32 = ctx->ptr[i], + }, }, }, }, @@ -690,9 +692,7 @@ void test_dynamic_vla_with_visitor(void) }; side_event_call(my_provider_event_dynamic_vla_visitor, side_arg_list( - side_arg_dynamic( - side_arg_dynamic_vla_visitor(test_dynamic_vla_visitor, &ctx, side_attr_list()) - ) + side_arg_dynamic_vla_visitor(test_dynamic_vla_visitor, &ctx, side_attr_list()) ) ); } @@ -701,7 +701,7 @@ void test_dynamic_vla_with_visitor(void) side_static_event(my_provider_event_dynamic_struct_visitor, "myprovider", "mydynamicstructvisitor", SIDE_LOGLEVEL_DEBUG, side_field_list( - side_field_dynamic("dynamic", side_attr_list()), + side_field_dynamic("dynamic"), ), side_attr_list() ); @@ -726,19 +726,21 @@ enum side_visitor_status test_dynamic_struct_visitor(const struct side_tracer_dy struct side_arg_dynamic_event_field dynamic_field = { .field_name = ctx->ptr[i].name, .elem = { - .dynamic_type = SIDE_DYNAMIC_TYPE_U32, + .type = SIDE_TYPE_DYNAMIC_U32, .u = { - .side_integer = { - .type = { - .attr = NULL, - .nr_attr = 0, - .integer_size_bits = 32, - .len_bits = 32, - .signedness = false, - .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, - }, - .value = { - .side_u32 = ctx->ptr[i].value, + .side_dynamic = { + .side_integer = { + .type = { + .attr = NULL, + .nr_attr = 0, + .integer_size_bits = 32, + .len_bits = 32, + .signedness = false, + .byte_order = SIDE_TYPE_BYTE_ORDER_HOST, + }, + .value = { + .side_u32 = ctx->ptr[i].value, + }, }, }, }, @@ -767,9 +769,7 @@ void test_dynamic_struct_with_visitor(void) }; side_event_call(my_provider_event_dynamic_struct_visitor, side_arg_list( - side_arg_dynamic( - side_arg_dynamic_struct_visitor(test_dynamic_struct_visitor, &ctx, side_attr_list()) - ) + side_arg_dynamic_struct_visitor(test_dynamic_struct_visitor, &ctx, side_attr_list()) ) ); } diff --git a/src/tracer.c b/src/tracer.c index 1fb5fab..c19fa96 100644 --- a/src/tracer.c +++ b/src/tracer.c @@ -22,23 +22,23 @@ enum tracer_display_base { static struct side_tracer_handle *tracer_handle; static -void tracer_print_struct(const struct side_type_description *type_desc, const struct side_arg_vec_description *sav_desc); +void tracer_print_struct(const struct side_type *type_desc, const struct side_arg_vec *sav_desc); static -void tracer_print_struct_sg(const struct side_type_description *type_desc, void *ptr); +void tracer_print_struct_sg(const struct side_type *type_desc, void *ptr); static -void tracer_print_array(const struct side_type_description *type_desc, const struct side_arg_vec_description *sav_desc); +void tracer_print_array(const struct side_type *type_desc, const struct side_arg_vec *sav_desc); static -void tracer_print_vla(const struct side_type_description *type_desc, const struct side_arg_vec_description *sav_desc); +void tracer_print_vla(const struct side_type *type_desc, const struct side_arg_vec *sav_desc); static -void tracer_print_vla_visitor(const struct side_type_description *type_desc, void *app_ctx); +void tracer_print_vla_visitor(const struct side_type *type_desc, void *app_ctx); static -void tracer_print_array_fixint(const struct side_type_description *type_desc, const struct side_arg_vec *item); +void tracer_print_array_fixint(const struct side_type *type_desc, const struct side_arg *item); static -void tracer_print_vla_fixint(const struct side_type_description *type_desc, const struct side_arg_vec *item); +void tracer_print_vla_fixint(const struct side_type *type_desc, const struct side_arg *item); static -void tracer_print_dynamic(const struct side_arg_dynamic_vec *dynamic_item); +void tracer_print_dynamic(const struct side_arg *dynamic_item); static -void tracer_print_type(const struct side_type_description *type_desc, const struct side_arg_vec *item); +void tracer_print_type(const struct side_type *type_desc, const struct side_arg *item); static int64_t get_attr_integer_value(const struct side_attr *attr) @@ -108,7 +108,7 @@ enum tracer_display_base get_attr_display_base(const struct side_attr *_attr, ui } static -bool type_to_host_reverse_bo(const struct side_type_description *type_desc) +bool type_to_host_reverse_bo(const struct side_type *type_desc) { switch (type_desc->type) { case SIDE_TYPE_U8: @@ -240,10 +240,10 @@ void print_attributes(const char *prefix_str, const char *separator, } static -void print_enum(const struct side_type_description *type_desc, const struct side_arg_vec *item) +void 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_description *elem_type = type_desc->u.side_enum.elem_type; + const struct side_type *elem_type = type_desc->u.side_enum.elem_type; int i, print_count = 0; int64_t value; @@ -253,13 +253,13 @@ void print_enum(const struct side_type_description *type_desc, const struct side } switch (item->type) { case SIDE_TYPE_U8: - value = (int64_t) item->u.integer_value.side_u8; + value = (int64_t) item->u.side_static.integer_value.side_u8; break; case SIDE_TYPE_U16: { uint16_t v; - v = item->u.integer_value.side_u16; + v = item->u.side_static.integer_value.side_u16; if (type_to_host_reverse_bo(elem_type)) v = side_bswap_16(v); value = (int64_t) v; @@ -269,7 +269,7 @@ void print_enum(const struct side_type_description *type_desc, const struct side { uint32_t v; - v = item->u.integer_value.side_u32; + v = item->u.side_static.integer_value.side_u32; if (type_to_host_reverse_bo(elem_type)) v = side_bswap_32(v); value = (int64_t) v; @@ -279,20 +279,20 @@ void print_enum(const struct side_type_description *type_desc, const struct side { uint64_t v; - v = item->u.integer_value.side_u64; + v = item->u.side_static.integer_value.side_u64; if (type_to_host_reverse_bo(elem_type)) v = side_bswap_64(v); value = (int64_t) v; break; } case SIDE_TYPE_S8: - value = (int64_t) item->u.integer_value.side_s8; + value = (int64_t) item->u.side_static.integer_value.side_s8; break; case SIDE_TYPE_S16: { int16_t v; - v = item->u.integer_value.side_s16; + v = item->u.side_static.integer_value.side_s16; if (type_to_host_reverse_bo(elem_type)) v = side_bswap_16(v); value = (int64_t) v; @@ -302,7 +302,7 @@ void print_enum(const struct side_type_description *type_desc, const struct side { int32_t v; - v = item->u.integer_value.side_s32; + v = item->u.side_static.integer_value.side_s32; if (type_to_host_reverse_bo(elem_type)) v = side_bswap_32(v); value = (int64_t) v; @@ -312,7 +312,7 @@ void print_enum(const struct side_type_description *type_desc, const struct side { int64_t v; - v = item->u.integer_value.side_s64; + v = item->u.side_static.integer_value.side_s64; if (type_to_host_reverse_bo(elem_type)) v = side_bswap_64(v); value = v; @@ -345,7 +345,7 @@ void print_enum(const struct side_type_description *type_desc, const struct side } static -uint32_t enum_elem_type_to_stride(const struct side_type_description *elem_type) +uint32_t enum_elem_type_to_stride(const struct side_type *elem_type) { uint32_t stride_bit; @@ -371,15 +371,15 @@ uint32_t enum_elem_type_to_stride(const struct side_type_description *elem_type) } static -void print_enum_bitmap(const struct side_type_description *type_desc, - const struct side_arg_vec *item) +void print_enum_bitmap(const struct side_type *type_desc, + const struct side_arg *item) { - const struct side_type_description *elem_type = type_desc->u.side_enum_bitmap.elem_type; + const struct side_type *elem_type = type_desc->u.side_enum_bitmap.elem_type; const struct side_enum_bitmap_mappings *side_enum_mappings = type_desc->u.side_enum_bitmap.mappings; int i, print_count = 0; uint32_t stride_bit, nr_items; bool reverse_byte_order = false; - const struct side_arg_vec *array_item; + const struct side_arg *array_item; switch (elem_type->type) { case SIDE_TYPE_U8: /* Fall-through */ @@ -395,14 +395,14 @@ void print_enum_bitmap(const struct side_type_description *type_desc, case SIDE_TYPE_ARRAY: stride_bit = enum_elem_type_to_stride(elem_type->u.side_array.elem_type); reverse_byte_order = type_to_host_reverse_bo(elem_type->u.side_array.elem_type); - array_item = item->u.side_array->sav; + array_item = item->u.side_static.side_array->sav; nr_items = type_desc->u.side_array.length; break; case SIDE_TYPE_VLA: stride_bit = enum_elem_type_to_stride(elem_type->u.side_vla.elem_type); reverse_byte_order = type_to_host_reverse_bo(elem_type->u.side_vla.elem_type); - array_item = item->u.side_vla->sav; - nr_items = item->u.side_vla->len; + array_item = item->u.side_static.side_vla->sav; + nr_items = item->u.side_static.side_vla->len; break; default: fprintf(stderr, "ERROR: Unexpected enum element type\n"); @@ -428,7 +428,7 @@ void print_enum_bitmap(const struct side_type_description *type_desc, switch (stride_bit) { case 8: { - uint8_t v = array_item[bit / 8].u.integer_value.side_u8; + uint8_t v = array_item[bit / 8].u.side_static.integer_value.side_u8; if (v & (1ULL << (bit % 8))) { match = true; goto match; @@ -437,7 +437,7 @@ void print_enum_bitmap(const struct side_type_description *type_desc, } case 16: { - uint16_t v = array_item[bit / 16].u.integer_value.side_u16; + uint16_t v = array_item[bit / 16].u.side_static.integer_value.side_u16; if (reverse_byte_order) v = side_bswap_16(v); if (v & (1ULL << (bit % 16))) { @@ -448,7 +448,7 @@ void print_enum_bitmap(const struct side_type_description *type_desc, } case 32: { - uint32_t v = array_item[bit / 32].u.integer_value.side_u32; + uint32_t v = array_item[bit / 32].u.side_static.integer_value.side_u32; if (reverse_byte_order) v = side_bswap_32(v); if (v & (1ULL << (bit % 32))) { @@ -459,7 +459,7 @@ void print_enum_bitmap(const struct side_type_description *type_desc, } case 64: { - uint64_t v = array_item[bit / 64].u.integer_value.side_u64; + uint64_t v = array_item[bit / 64].u.side_static.integer_value.side_u64; if (reverse_byte_order) v = side_bswap_64(v); if (v & (1ULL << (bit % 64))) { @@ -712,9 +712,9 @@ void tracer_print_type_float(const char *separator, } static -void tracer_print_type(const struct side_type_description *type_desc, const struct side_arg_vec *item) +void tracer_print_type(const struct side_type *type_desc, const struct side_arg *item) { - enum side_type type; + enum side_type_label type; switch (type_desc->type) { case SIDE_TYPE_ARRAY: @@ -796,6 +796,38 @@ void tracer_print_type(const struct side_type_description *type_desc, const stru } break; + case SIDE_TYPE_DYNAMIC: + switch (item->type) { + case SIDE_TYPE_DYNAMIC_NULL: + case SIDE_TYPE_DYNAMIC_BOOL: + case SIDE_TYPE_DYNAMIC_U8: + case SIDE_TYPE_DYNAMIC_U16: + case SIDE_TYPE_DYNAMIC_U32: + case SIDE_TYPE_DYNAMIC_U64: + case SIDE_TYPE_DYNAMIC_S8: + case SIDE_TYPE_DYNAMIC_S16: + case SIDE_TYPE_DYNAMIC_S32: + case SIDE_TYPE_DYNAMIC_S64: + case SIDE_TYPE_DYNAMIC_BYTE: + case SIDE_TYPE_DYNAMIC_POINTER32: + case SIDE_TYPE_DYNAMIC_POINTER64: + case SIDE_TYPE_DYNAMIC_FLOAT_BINARY16: + case SIDE_TYPE_DYNAMIC_FLOAT_BINARY32: + case SIDE_TYPE_DYNAMIC_FLOAT_BINARY64: + case SIDE_TYPE_DYNAMIC_FLOAT_BINARY128: + case SIDE_TYPE_DYNAMIC_STRING: + case SIDE_TYPE_DYNAMIC_STRUCT: + case SIDE_TYPE_DYNAMIC_STRUCT_VISITOR: + case SIDE_TYPE_DYNAMIC_VLA: + case SIDE_TYPE_DYNAMIC_VLA_VISITOR: + break; + default: + fprintf(stderr, "ERROR: Unexpected dynamic type\n"); + abort(); + break; + } + break; + default: if (type_desc->type != item->type) { fprintf(stderr, "ERROR: type mismatch between description and arguments\n"); @@ -818,7 +850,7 @@ void tracer_print_type(const struct side_type_description *type_desc, const stru case SIDE_TYPE_BOOL: tracer_print_type_header(":", type_desc->u.side_bool.attr, type_desc->u.side_bool.nr_attr); - printf("%s", item->u.bool_value ? "true" : "false"); + printf("%s", item->u.side_static.bool_value ? "true" : "false"); break; case SIDE_TYPE_U8: @@ -829,19 +861,19 @@ void tracer_print_type(const struct side_type_description *type_desc, const stru case SIDE_TYPE_S16: case SIDE_TYPE_S32: case SIDE_TYPE_S64: - tracer_print_type_integer(":", &type_desc->u.side_integer, &item->u.integer_value, 0, + tracer_print_type_integer(":", &type_desc->u.side_integer, &item->u.side_static.integer_value, 0, TRACER_DISPLAY_BASE_10); break; case SIDE_TYPE_POINTER32: case SIDE_TYPE_POINTER64: - tracer_print_type_integer(":", &type_desc->u.side_integer, &item->u.integer_value, 0, + tracer_print_type_integer(":", &type_desc->u.side_integer, &item->u.side_static.integer_value, 0, TRACER_DISPLAY_BASE_16); break; case SIDE_TYPE_BYTE: tracer_print_type_header(":", type_desc->u.side_byte.attr, type_desc->u.side_byte.nr_attr); - printf("0x%" PRIx8, item->u.byte_value); + printf("0x%" PRIx8, item->u.side_static.byte_value); break; case SIDE_TYPE_ENUM: @@ -856,28 +888,27 @@ void tracer_print_type(const struct side_type_description *type_desc, const stru case SIDE_TYPE_FLOAT_BINARY32: case SIDE_TYPE_FLOAT_BINARY64: case SIDE_TYPE_FLOAT_BINARY128: - tracer_print_type_float(":", &type_desc->u.side_float, - &item->u.float_value); + tracer_print_type_float(":", &type_desc->u.side_float, &item->u.side_static.float_value); break; case SIDE_TYPE_STRING: tracer_print_type_header(":", type_desc->u.side_string.attr, type_desc->u.side_string.nr_attr); - printf("\"%s\"", (const char *)(uintptr_t) item->u.string_value); + printf("\"%s\"", (const char *)(uintptr_t) item->u.side_static.string_value); break; case SIDE_TYPE_STRUCT: - tracer_print_struct(type_desc, item->u.side_struct); + tracer_print_struct(type_desc, item->u.side_static.side_struct); break; case SIDE_TYPE_STRUCT_SG: - tracer_print_struct_sg(type_desc, item->u.side_struct_sg_ptr); + tracer_print_struct_sg(type_desc, item->u.side_static.side_struct_sg_ptr); break; case SIDE_TYPE_ARRAY: - tracer_print_array(type_desc, item->u.side_array); + tracer_print_array(type_desc, item->u.side_static.side_array); break; case SIDE_TYPE_VLA: - tracer_print_vla(type_desc, item->u.side_vla); + tracer_print_vla(type_desc, item->u.side_static.side_vla); break; case SIDE_TYPE_VLA_VISITOR: - tracer_print_vla_visitor(type_desc, item->u.side_vla_app_visitor_ctx); + tracer_print_vla_visitor(type_desc, item->u.side_static.side_vla_app_visitor_ctx); break; case SIDE_TYPE_ARRAY_U8: case SIDE_TYPE_ARRAY_U16: @@ -905,9 +936,31 @@ void tracer_print_type(const struct side_type_description *type_desc, const stru case SIDE_TYPE_VLA_POINTER64: tracer_print_vla_fixint(type_desc, item); break; - case SIDE_TYPE_DYNAMIC: - tracer_print_type_header(":", type_desc->u.side_dynamic.attr, type_desc->u.side_dynamic.nr_attr); - tracer_print_dynamic(&item->u.dynamic_value); + + /* Dynamic types */ + case SIDE_TYPE_DYNAMIC_NULL: + case SIDE_TYPE_DYNAMIC_BOOL: + case SIDE_TYPE_DYNAMIC_U8: + case SIDE_TYPE_DYNAMIC_U16: + case SIDE_TYPE_DYNAMIC_U32: + case SIDE_TYPE_DYNAMIC_U64: + case SIDE_TYPE_DYNAMIC_S8: + case SIDE_TYPE_DYNAMIC_S16: + case SIDE_TYPE_DYNAMIC_S32: + case SIDE_TYPE_DYNAMIC_S64: + case SIDE_TYPE_DYNAMIC_BYTE: + case SIDE_TYPE_DYNAMIC_POINTER32: + case SIDE_TYPE_DYNAMIC_POINTER64: + case SIDE_TYPE_DYNAMIC_FLOAT_BINARY16: + case SIDE_TYPE_DYNAMIC_FLOAT_BINARY32: + case SIDE_TYPE_DYNAMIC_FLOAT_BINARY64: + case SIDE_TYPE_DYNAMIC_FLOAT_BINARY128: + case SIDE_TYPE_DYNAMIC_STRING: + case SIDE_TYPE_DYNAMIC_STRUCT: + case SIDE_TYPE_DYNAMIC_STRUCT_VISITOR: + case SIDE_TYPE_DYNAMIC_VLA: + case SIDE_TYPE_DYNAMIC_VLA_VISITOR: + tracer_print_dynamic(item); break; default: fprintf(stderr, ""); @@ -917,16 +970,16 @@ void tracer_print_type(const struct side_type_description *type_desc, const stru } static -void tracer_print_field(const struct side_event_field *item_desc, const struct side_arg_vec *item) +void tracer_print_field(const struct side_event_field *item_desc, const struct side_arg *item) { printf("%s: ", item_desc->field_name); tracer_print_type(&item_desc->side_type, item); } static -void tracer_print_struct(const struct side_type_description *type_desc, const struct side_arg_vec_description *sav_desc) +void tracer_print_struct(const struct side_type *type_desc, const struct side_arg_vec *sav_desc) { - const struct side_arg_vec *sav = sav_desc->sav; + const struct side_arg *sav = sav_desc->sav; uint32_t side_sav_len = sav_desc->len; int i; @@ -987,7 +1040,7 @@ void tracer_print_sg_field(const struct side_struct_field_sg *field_sg, void *pt } static -void tracer_print_struct_sg(const struct side_type_description *type_desc, void *ptr) +void tracer_print_struct_sg(const struct side_type *type_desc, void *ptr) { const struct side_type_struct_sg *struct_sg = type_desc->u.side_struct_sg; int i; @@ -1003,9 +1056,9 @@ void tracer_print_struct_sg(const struct side_type_description *type_desc, void } static -void tracer_print_array(const struct side_type_description *type_desc, const struct side_arg_vec_description *sav_desc) +void tracer_print_array(const struct side_type *type_desc, const struct side_arg_vec *sav_desc) { - const struct side_arg_vec *sav = sav_desc->sav; + const struct side_arg *sav = sav_desc->sav; uint32_t side_sav_len = sav_desc->len; int i; @@ -1025,9 +1078,9 @@ void tracer_print_array(const struct side_type_description *type_desc, const str } static -void tracer_print_vla(const struct side_type_description *type_desc, const struct side_arg_vec_description *sav_desc) +void tracer_print_vla(const struct side_type *type_desc, const struct side_arg_vec *sav_desc) { - const struct side_arg_vec *sav = sav_desc->sav; + const struct side_arg *sav = sav_desc->sav; uint32_t side_sav_len = sav_desc->len; int i; @@ -1043,13 +1096,13 @@ void tracer_print_vla(const struct side_type_description *type_desc, const struc } struct tracer_visitor_priv { - const struct side_type_description *elem_type; + const struct side_type *elem_type; int i; }; static enum side_visitor_status tracer_write_elem_cb(const struct side_tracer_visitor_ctx *tracer_ctx, - const struct side_arg_vec *elem) + const struct side_arg *elem) { struct tracer_visitor_priv *tracer_priv = tracer_ctx->priv; @@ -1059,7 +1112,7 @@ enum side_visitor_status tracer_write_elem_cb(const struct side_tracer_visitor_c } static -void tracer_print_vla_visitor(const struct side_type_description *type_desc, void *app_ctx) +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 = { @@ -1086,12 +1139,12 @@ void tracer_print_vla_visitor(const struct side_type_description *type_desc, voi printf(" ]"); } -void tracer_print_array_fixint(const struct side_type_description *type_desc, const struct side_arg_vec *item) +void tracer_print_array_fixint(const struct side_type *type_desc, const struct side_arg *item) { - const struct side_type_description *elem_type = type_desc->u.side_array.elem_type; + const struct side_type *elem_type = type_desc->u.side_array.elem_type; uint32_t side_sav_len = type_desc->u.side_array.length; - void *p = item->u.side_array_fixint; - enum side_type side_type; + void *p = item->u.side_static.side_array_fixint; + enum side_type_label side_type; int i; print_attributes("attr", ":", type_desc->u.side_array.attr, type_desc->u.side_array.nr_attr); @@ -1148,43 +1201,43 @@ void tracer_print_array_fixint(const struct side_type_description *type_desc, co printf("[ "); for (i = 0; i < side_sav_len; i++) { - struct side_arg_vec sav_elem = { + struct side_arg sav_elem = { .type = side_type, }; switch (side_type) { case SIDE_TYPE_U8: - sav_elem.u.integer_value.side_u8 = ((const uint8_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_u8 = ((const uint8_t *) p)[i]; break; case SIDE_TYPE_S8: - sav_elem.u.integer_value.side_s8 = ((const int8_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_s8 = ((const int8_t *) p)[i]; break; case SIDE_TYPE_U16: - sav_elem.u.integer_value.side_u16 = ((const uint16_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_u16 = ((const uint16_t *) p)[i]; break; case SIDE_TYPE_S16: - sav_elem.u.integer_value.side_s16 = ((const int16_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_s16 = ((const int16_t *) p)[i]; break; case SIDE_TYPE_U32: - sav_elem.u.integer_value.side_u32 = ((const uint32_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_u32 = ((const uint32_t *) p)[i]; break; case SIDE_TYPE_S32: - sav_elem.u.integer_value.side_s32 = ((const int32_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_s32 = ((const int32_t *) p)[i]; break; case SIDE_TYPE_U64: - sav_elem.u.integer_value.side_u64 = ((const uint64_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_u64 = ((const uint64_t *) p)[i]; break; case SIDE_TYPE_S64: - sav_elem.u.integer_value.side_s64 = ((const int64_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_s64 = ((const int64_t *) p)[i]; break; case SIDE_TYPE_BYTE: - sav_elem.u.byte_value = ((const uint8_t *) p)[i]; + sav_elem.u.side_static.byte_value = ((const uint8_t *) p)[i]; break; case SIDE_TYPE_POINTER32: - sav_elem.u.integer_value.side_u32 = ((const uint32_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_u32 = ((const uint32_t *) p)[i]; break; case SIDE_TYPE_POINTER64: - sav_elem.u.integer_value.side_u64 = ((const uint64_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_u64 = ((const uint64_t *) p)[i]; break; default: @@ -1203,12 +1256,12 @@ type_error: abort(); } -void tracer_print_vla_fixint(const struct side_type_description *type_desc, const struct side_arg_vec *item) +void tracer_print_vla_fixint(const struct side_type *type_desc, const struct side_arg *item) { - const struct side_type_description *elem_type = type_desc->u.side_vla.elem_type; - uint32_t side_sav_len = item->u.side_vla_fixint.length; - void *p = item->u.side_vla_fixint.p; - enum side_type side_type; + const struct side_type *elem_type = type_desc->u.side_vla.elem_type; + uint32_t side_sav_len = item->u.side_static.side_vla_fixint.length; + void *p = item->u.side_static.side_vla_fixint.p; + enum side_type_label side_type; int i; print_attributes("attr", ":", type_desc->u.side_vla.attr, type_desc->u.side_vla.nr_attr); @@ -1265,43 +1318,43 @@ void tracer_print_vla_fixint(const struct side_type_description *type_desc, cons printf("[ "); for (i = 0; i < side_sav_len; i++) { - struct side_arg_vec sav_elem = { + struct side_arg sav_elem = { .type = side_type, }; switch (side_type) { case SIDE_TYPE_U8: - sav_elem.u.integer_value.side_u8 = ((const uint8_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_u8 = ((const uint8_t *) p)[i]; break; case SIDE_TYPE_S8: - sav_elem.u.integer_value.side_s8 = ((const int8_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_s8 = ((const int8_t *) p)[i]; break; case SIDE_TYPE_U16: - sav_elem.u.integer_value.side_u16 = ((const uint16_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_u16 = ((const uint16_t *) p)[i]; break; case SIDE_TYPE_S16: - sav_elem.u.integer_value.side_s16 = ((const int16_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_s16 = ((const int16_t *) p)[i]; break; case SIDE_TYPE_U32: - sav_elem.u.integer_value.side_u32 = ((const uint32_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_u32 = ((const uint32_t *) p)[i]; break; case SIDE_TYPE_S32: - sav_elem.u.integer_value.side_s32 = ((const int32_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_s32 = ((const int32_t *) p)[i]; break; case SIDE_TYPE_U64: - sav_elem.u.integer_value.side_u64 = ((const uint64_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_u64 = ((const uint64_t *) p)[i]; break; case SIDE_TYPE_S64: - sav_elem.u.integer_value.side_s64 = ((const int64_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_s64 = ((const int64_t *) p)[i]; break; case SIDE_TYPE_BYTE: - sav_elem.u.byte_value = ((const uint8_t *) p)[i]; + sav_elem.u.side_static.byte_value = ((const uint8_t *) p)[i]; break; case SIDE_TYPE_POINTER32: - sav_elem.u.integer_value.side_u32 = ((const uint32_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_u32 = ((const uint32_t *) p)[i]; break; case SIDE_TYPE_POINTER64: - sav_elem.u.integer_value.side_u64 = ((const uint64_t *) p)[i]; + sav_elem.u.side_static.integer_value.side_u64 = ((const uint64_t *) p)[i]; break; default: @@ -1357,7 +1410,7 @@ enum side_visitor_status tracer_dynamic_struct_write_elem_cb( } static -void tracer_print_dynamic_struct_visitor(const struct side_arg_dynamic_vec *item) +void tracer_print_dynamic_struct_visitor(const struct side_arg *item) { enum side_visitor_status status; struct tracer_dynamic_struct_visitor_priv tracer_priv = { @@ -1367,13 +1420,13 @@ void tracer_print_dynamic_struct_visitor(const struct side_arg_dynamic_vec *item .write_field = tracer_dynamic_struct_write_elem_cb, .priv = &tracer_priv, }; - void *app_ctx = item->u.side_dynamic_struct_visitor.app_ctx; + void *app_ctx = item->u.side_dynamic.side_dynamic_struct_visitor.app_ctx; - print_attributes("attr", "::", item->u.side_dynamic_struct_visitor.attr, item->u.side_dynamic_struct_visitor.nr_attr); - printf("%s", item->u.side_dynamic_struct_visitor.nr_attr ? ", " : ""); + print_attributes("attr", "::", 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_struct_visitor.visitor(&tracer_ctx, app_ctx); + status = item->u.side_dynamic.side_dynamic_struct_visitor.visitor(&tracer_ctx, app_ctx); switch (status) { case SIDE_VISITOR_STATUS_OK: break; @@ -1385,9 +1438,9 @@ void tracer_print_dynamic_struct_visitor(const struct side_arg_dynamic_vec *item } static -void tracer_print_dynamic_vla(const struct side_arg_dynamic_vec_vla *vla) +void tracer_print_dynamic_vla(const struct side_arg_dynamic_vla *vla) { - const struct side_arg_dynamic_vec *sav = vla->sav; + const struct side_arg *sav = vla->sav; uint32_t side_sav_len = vla->len; int i; @@ -1409,7 +1462,7 @@ struct tracer_dynamic_vla_visitor_priv { static enum side_visitor_status tracer_dynamic_vla_write_elem_cb( const struct side_tracer_dynamic_vla_visitor_ctx *tracer_ctx, - const struct side_arg_dynamic_vec *elem) + const struct side_arg *elem) { struct tracer_dynamic_vla_visitor_priv *tracer_priv = tracer_ctx->priv; @@ -1419,7 +1472,7 @@ enum side_visitor_status tracer_dynamic_vla_write_elem_cb( } static -void tracer_print_dynamic_vla_visitor(const struct side_arg_dynamic_vec *item) +void tracer_print_dynamic_vla_visitor(const struct side_arg *item) { enum side_visitor_status status; struct tracer_dynamic_vla_visitor_priv tracer_priv = { @@ -1429,13 +1482,13 @@ void tracer_print_dynamic_vla_visitor(const struct side_arg_dynamic_vec *item) .write_elem = tracer_dynamic_vla_write_elem_cb, .priv = &tracer_priv, }; - void *app_ctx = item->u.side_dynamic_vla_visitor.app_ctx; + void *app_ctx = item->u.side_dynamic.side_dynamic_vla_visitor.app_ctx; - print_attributes("attr", "::", item->u.side_dynamic_vla_visitor.attr, item->u.side_dynamic_vla_visitor.nr_attr); - printf("%s", item->u.side_dynamic_vla_visitor.nr_attr ? ", " : ""); + print_attributes("attr", "::", 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_vla_visitor.visitor(&tracer_ctx, app_ctx); + status = item->u.side_dynamic.side_dynamic_vla_visitor.visitor(&tracer_ctx, app_ctx); switch (status) { case SIDE_VISITOR_STATUS_OK: break; @@ -1447,62 +1500,62 @@ void tracer_print_dynamic_vla_visitor(const struct side_arg_dynamic_vec *item) } static -void tracer_print_dynamic(const struct side_arg_dynamic_vec *item) +void tracer_print_dynamic(const struct side_arg *item) { printf("{ "); - switch (item->dynamic_type) { - case SIDE_DYNAMIC_TYPE_NULL: - tracer_print_type_header("::", item->u.side_null.attr, item->u.side_null.nr_attr); + switch (item->type) { + case SIDE_TYPE_DYNAMIC_NULL: + tracer_print_type_header("::", item->u.side_dynamic.side_null.attr, item->u.side_dynamic.side_null.nr_attr); printf(""); break; - case SIDE_DYNAMIC_TYPE_BOOL: - tracer_print_type_header("::", item->u.side_bool.type.attr, item->u.side_bool.type.nr_attr); - printf("%s", item->u.side_bool.value ? "true" : "false"); - break; - case SIDE_DYNAMIC_TYPE_U8: - case SIDE_DYNAMIC_TYPE_U16: - case SIDE_DYNAMIC_TYPE_U32: - case SIDE_DYNAMIC_TYPE_U64: - case SIDE_DYNAMIC_TYPE_S8: - case SIDE_DYNAMIC_TYPE_S16: - case SIDE_DYNAMIC_TYPE_S32: - case SIDE_DYNAMIC_TYPE_S64: - tracer_print_type_integer("::", &item->u.side_integer.type, &item->u.side_integer.value, 0, + case SIDE_TYPE_DYNAMIC_BOOL: + tracer_print_type_header("::", item->u.side_dynamic.side_bool.type.attr, item->u.side_dynamic.side_bool.type.nr_attr); + printf("%s", item->u.side_dynamic.side_bool.value ? "true" : "false"); + break; + case SIDE_TYPE_DYNAMIC_U8: + case SIDE_TYPE_DYNAMIC_U16: + case SIDE_TYPE_DYNAMIC_U32: + case SIDE_TYPE_DYNAMIC_U64: + case SIDE_TYPE_DYNAMIC_S8: + case SIDE_TYPE_DYNAMIC_S16: + case SIDE_TYPE_DYNAMIC_S32: + case SIDE_TYPE_DYNAMIC_S64: + tracer_print_type_integer("::", &item->u.side_dynamic.side_integer.type, &item->u.side_dynamic.side_integer.value, 0, TRACER_DISPLAY_BASE_10); break; - case SIDE_DYNAMIC_TYPE_BYTE: - tracer_print_type_header("::", item->u.side_byte.type.attr, item->u.side_byte.type.nr_attr); - printf("0x%" PRIx8, item->u.side_byte.value); + 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); + printf("0x%" PRIx8, item->u.side_dynamic.side_byte.value); break; - case SIDE_DYNAMIC_TYPE_POINTER32: - case SIDE_DYNAMIC_TYPE_POINTER64: - tracer_print_type_integer("::", &item->u.side_integer.type, &item->u.side_integer.value, 0, + case SIDE_TYPE_DYNAMIC_POINTER32: + case SIDE_TYPE_DYNAMIC_POINTER64: + tracer_print_type_integer("::", &item->u.side_dynamic.side_integer.type, &item->u.side_dynamic.side_integer.value, 0, TRACER_DISPLAY_BASE_16); break; - case SIDE_DYNAMIC_TYPE_FLOAT_BINARY16: - case SIDE_DYNAMIC_TYPE_FLOAT_BINARY32: - case SIDE_DYNAMIC_TYPE_FLOAT_BINARY64: - case SIDE_DYNAMIC_TYPE_FLOAT_BINARY128: - tracer_print_type_float("::", &item->u.side_float.type, - &item->u.side_float.value); + case SIDE_TYPE_DYNAMIC_FLOAT_BINARY16: + case SIDE_TYPE_DYNAMIC_FLOAT_BINARY32: + case SIDE_TYPE_DYNAMIC_FLOAT_BINARY64: + case SIDE_TYPE_DYNAMIC_FLOAT_BINARY128: + tracer_print_type_float("::", &item->u.side_dynamic.side_float.type, + &item->u.side_dynamic.side_float.value); break; - case SIDE_DYNAMIC_TYPE_STRING: - tracer_print_type_header("::", item->u.side_string.type.attr, item->u.side_string.type.nr_attr); - printf("\"%s\"", (const char *)(uintptr_t) item->u.side_string.value); + 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); + printf("\"%s\"", (const char *)(uintptr_t) item->u.side_dynamic.side_string.value); break; - case SIDE_DYNAMIC_TYPE_STRUCT: - tracer_print_dynamic_struct(item->u.side_dynamic_struct); + case SIDE_TYPE_DYNAMIC_STRUCT: + tracer_print_dynamic_struct(item->u.side_dynamic.side_dynamic_struct); break; - case SIDE_DYNAMIC_TYPE_STRUCT_VISITOR: + case SIDE_TYPE_DYNAMIC_STRUCT_VISITOR: tracer_print_dynamic_struct_visitor(item); break; - case SIDE_DYNAMIC_TYPE_VLA: - tracer_print_dynamic_vla(item->u.side_dynamic_vla); + case SIDE_TYPE_DYNAMIC_VLA: + tracer_print_dynamic_vla(item->u.side_dynamic.side_dynamic_vla); break; - case SIDE_DYNAMIC_TYPE_VLA_VISITOR: + case SIDE_TYPE_DYNAMIC_VLA_VISITOR: tracer_print_dynamic_vla_visitor(item); break; default: @@ -1514,10 +1567,10 @@ void tracer_print_dynamic(const struct side_arg_dynamic_vec *item) static void tracer_print_static_fields(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, int *nr_items) { - const struct side_arg_vec *sav = sav_desc->sav; + const struct side_arg *sav = sav_desc->sav; uint32_t side_sav_len = sav_desc->len; int i; @@ -1539,7 +1592,7 @@ void tracer_print_static_fields(const struct side_event_description *desc, } void tracer_call(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, void *priv __attribute__((unused))) { int nr_fields = 0; @@ -1549,7 +1602,7 @@ void tracer_call(const struct side_event_description *desc, } void tracer_call_variadic(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, const struct side_arg_dynamic_event_struct *var_struct, void *priv __attribute__((unused))) { diff --git a/src/tracer.h b/src/tracer.h index 0b3b4a6..5f4820c 100644 --- a/src/tracer.h +++ b/src/tracer.h @@ -9,10 +9,10 @@ #include void tracer_call(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, void *priv); void tracer_call_variadic(const struct side_event_description *desc, - const struct side_arg_vec_description *sav_desc, + const struct side_arg_vec *sav_desc, const struct side_arg_dynamic_event_struct *var_struct, void *priv); -- 2.34.1