Add key characteristics to rfc master
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Tue, 28 May 2024 19:46:19 +0000 (15:46 -0400)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Tue, 28 May 2024 19:46:19 +0000 (15:46 -0400)
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
doc/rfc-side-abi.txt
include/side/abi/type-description.h
include/side/instrumentation-c-api.h
src/Makefile.am
src/side.c
src/tracer.c
src/visit-arg-vec.c
src/visit-arg-vec.h
src/visit-description.c [new file with mode: 0644]
src/visit-description.h [new file with mode: 0644]
tests/unit/test.c

index 8476672547590b7654af9b1bfe76831438e51a68..89cefd3a198dd84046bfa3b5bdce646449441975 100644 (file)
@@ -9,6 +9,16 @@ RFC - SIDE ABI
 The purpose of the SIDE ABI is to allow kernel and user-space tracers to
 attach to static and dynamic instrumentation of user-space applications.
 
+The SIDE ABI key characteristics:
+
+- runtime and language agnostic,
+- supports multiple concurrent tracers,
+- instrumentation is not specific to a tracer, so there is no need
+  to rebuild applications if using a different tracer,
+- instrumentation can be either static or dynamic,
+- supports complex and nested types,
+- supports both static and dynamic types.
+
 The SIDE ABI expresses the instrumentation description as data (no
 generated code). Instrumentation arguments are passed on the stack as an
 array of typed items, along with a reference to the instrumentation
index 4cab53717f75c0843db064ce9f6ab8bcb1337cf3..66ac9f4d58a92860afbaadf742794752930ab769 100644 (file)
@@ -260,18 +260,20 @@ side_check_size(struct side_type_array, 40);
 
 struct side_type_vla {
        side_ptr_t(const struct side_type) elem_type;
+       side_ptr_t(const struct side_type) length_type;
        side_ptr_t(const struct side_attr) attr;
        uint32_t nr_attr;
 } SIDE_PACKED;
-side_check_size(struct side_type_vla, 36);
+side_check_size(struct side_type_vla, 52);
 
 struct side_type_vla_visitor {
        side_ptr_t(const struct side_type) elem_type;
+       side_ptr_t(const struct side_type) length_type;
        side_func_ptr_t(side_visitor_func) visitor;
        side_ptr_t(const struct side_attr) attr;
        uint32_t nr_attr;
 } SIDE_PACKED;
-side_check_size(struct side_type_vla_visitor, 52);
+side_check_size(struct side_type_vla_visitor, 68);
 
 struct side_type_enum {
        side_ptr_t(const struct side_enum_mappings) mappings;
@@ -288,14 +290,14 @@ side_check_size(struct side_type_enum_bitmap, 32);
 struct side_type_gather_bool {
        uint64_t offset;        /* bytes */
        uint16_t offset_bits;   /* bits */
-       uint8_t access_mode;    /* enum side_type_gather_access_mode */
+       side_enum_t(enum side_type_gather_access_mode, uint8_t) access_mode;
        struct side_type_bool type;
 } SIDE_PACKED;
 side_check_size(struct side_type_gather_bool, 11 + sizeof(struct side_type_bool));
 
 struct side_type_gather_byte {
        uint64_t offset;        /* bytes */
-       uint8_t access_mode;    /* enum side_type_gather_access_mode */
+       side_enum_t(enum side_type_gather_access_mode, uint8_t) access_mode;
        struct side_type_byte type;
 } SIDE_PACKED;
 side_check_size(struct side_type_gather_byte, 9 + sizeof(struct side_type_byte));
@@ -303,21 +305,21 @@ side_check_size(struct side_type_gather_byte, 9 + sizeof(struct side_type_byte))
 struct side_type_gather_integer {
        uint64_t offset;        /* bytes */
        uint16_t offset_bits;   /* bits */
-       uint8_t access_mode;    /* enum side_type_gather_access_mode */
+       side_enum_t(enum side_type_gather_access_mode, uint8_t) access_mode;
        struct side_type_integer type;
 } SIDE_PACKED;
 side_check_size(struct side_type_gather_integer, 11 + sizeof(struct side_type_integer));
 
 struct side_type_gather_float {
        uint64_t offset;        /* bytes */
-       uint8_t access_mode;    /* enum side_type_gather_access_mode */
+       side_enum_t(enum side_type_gather_access_mode, uint8_t) access_mode;
        struct side_type_float type;
 } SIDE_PACKED;
 side_check_size(struct side_type_gather_float, 9 + sizeof(struct side_type_float));
 
 struct side_type_gather_string {
        uint64_t offset;        /* bytes */
-       uint8_t access_mode;    /* enum side_type_gather_access_mode */
+       side_enum_t(enum side_type_gather_access_mode, uint8_t) access_mode;
        struct side_type_string type;
 } SIDE_PACKED;
 side_check_size(struct side_type_gather_string, 9 + sizeof(struct side_type_string));
@@ -331,25 +333,25 @@ side_check_size(struct side_type_gather_enum, 32);
 struct side_type_gather_struct {
        side_ptr_t(const struct side_type_struct) type;
        uint64_t offset;        /* bytes */
-       uint8_t access_mode;    /* enum side_type_gather_access_mode */
+       side_enum_t(enum side_type_gather_access_mode, uint8_t) access_mode;
        uint32_t size;          /* bytes */
 } SIDE_PACKED;
 side_check_size(struct side_type_gather_struct, 29);
 
 struct side_type_gather_array {
        uint64_t offset;        /* bytes */
-       uint8_t access_mode;    /* enum side_type_gather_access_mode */
+       side_enum_t(enum side_type_gather_access_mode, uint8_t) access_mode;
        struct side_type_array type;
 } SIDE_PACKED;
 side_check_size(struct side_type_gather_array, 9 + sizeof(struct side_type_array));
 
 struct side_type_gather_vla {
-       side_ptr_t(const struct side_type) length_type; /* side_length() */
        uint64_t offset;        /* bytes */
-       uint8_t access_mode;    /* enum side_type_gather_access_mode */
+       side_enum_t(enum side_type_gather_access_mode, uint8_t) access_mode;
+       /* Use side_length() for type->length_type. */
        struct side_type_vla type;
 } SIDE_PACKED;
-side_check_size(struct side_type_gather_vla, 25 + sizeof(struct side_type_vla));
+side_check_size(struct side_type_gather_vla, 9 + sizeof(struct side_type_vla));
 
 struct side_type_gather {
        union {
@@ -381,7 +383,7 @@ struct side_type {
                /* Stack-copy compound types */
                struct side_type_array side_array;
                struct side_type_vla side_vla;
-               struct side_type_vla_visitor side_vla_visitor;
+               side_ptr_t(const struct side_type_vla_visitor) side_vla_visitor;
                side_ptr_t(const struct side_type_struct) side_struct;
                side_ptr_t(const struct side_type_variant) side_variant;
 
index 6b4b4592d65bfb5fc599e9974f7630cd8ca96e2c..d48eb60bd527ce364e21ab17c33d6d9cac90ab96 100644 (file)
 #define side_field_array(_name, _elem_type, _length, _attr...) \
        _side_field(_name, side_type_array(SIDE_PARAM(_elem_type), _length, SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())))
 
-#define side_type_vla(_elem_type, _attr...) \
+#define side_type_vla(_elem_type, _length_type, _attr...) \
        { \
                .type = SIDE_ENUM_INIT(SIDE_TYPE_VLA), \
                .u = { \
                        .side_vla = { \
                                .elem_type = SIDE_PTR_INIT(_elem_type), \
+                               .length_type = SIDE_PTR_INIT(_length_type), \
                                .attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                                .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                        }, \
                }, \
        }
-#define side_field_vla(_name, _elem_type, _attr...) \
-       _side_field(_name, side_type_vla(SIDE_PARAM(_elem_type), SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())))
+#define side_field_vla(_name, _elem_type, _length_type, _attr...) \
+       _side_field(_name, side_type_vla(SIDE_PARAM(_elem_type), SIDE_PARAM(_length_type), SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())))
 
-#define side_type_vla_visitor(_elem_type, _visitor, _attr...) \
+#define _side_type_vla_visitor_define(_elem_type, _length_type, _visitor, _attr...) \
+       { \
+               .elem_type = SIDE_PTR_INIT(_elem_type), \
+               .length_type = SIDE_PTR_INIT(_length_type), \
+               .visitor = SIDE_PTR_INIT(_visitor), \
+               .attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
+               .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
+       }
+
+#define side_define_vla_visitor(_identifier, _elem_type, _length_type, _visitor, _attr...) \
+       const struct side_type_struct _identifier = _side_type_struct_define(SIDE_PARAM(_elem_type), SIDE_PARAM(_length_type), SIDE_PARAM(_visitor), SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list()))
+
+#define side_vla_visitor_literal(_elem_type, _length_type, _visitor, _attr...) \
+       SIDE_COMPOUND_LITERAL(const struct side_type_vla_visitor, \
+               _side_type_vla_visitor_define(SIDE_PARAM(_elem_type), SIDE_PARAM(_length_type), SIDE_PARAM(_visitor), SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())))
+
+#define side_type_vla_visitor(_vla_visitor) \
        { \
                .type = SIDE_ENUM_INIT(SIDE_TYPE_VLA_VISITOR), \
                .u = { \
-                       .side_vla_visitor = { \
-                               .elem_type = SIDE_PTR_INIT(_elem_type), \
-                               .visitor = SIDE_PTR_INIT(_visitor), \
-                               .attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
-                               .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
-                       }, \
+                       .side_vla_visitor = SIDE_PTR_INIT(_vla_visitor), \
                }, \
        }
-#define side_field_vla_visitor(_name, _elem_type, _visitor, _attr...) \
-       _side_field(_name, side_type_vla_visitor(SIDE_PARAM(_elem_type), _visitor, SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())))
+#define side_field_vla_visitor(_name, _vla_visitor) \
+       _side_field(_name, side_type_vla_visitor(SIDE_PARAM(_vla_visitor)))
 
 /* Gather field and type definitions */
 
                                .u = { \
                                        .side_byte = { \
                                                .offset = _offset, \
-                                               .access_mode = _access_mode, \
+                                               .access_mode = SIDE_ENUM_INIT(_access_mode), \
                                                .type = { \
                                                        .attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                                                        .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                                .u = { \
                                        .side_bool = { \
                                                .offset = _offset, \
-                                               .access_mode = _access_mode, \
+                                               .access_mode = SIDE_ENUM_INIT(_access_mode), \
                                                .type = { \
                                                        .attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                                                        .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                                .u = { \
                                        .side_integer = { \
                                                .offset = _offset, \
-                                               .access_mode = _access_mode, \
+                                               .access_mode = SIDE_ENUM_INIT(_access_mode), \
                                                .type = { \
                                                        .attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                                                        .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                                .u = { \
                                        .side_float = { \
                                                .offset = _offset, \
-                                               .access_mode = _access_mode, \
+                                               .access_mode = SIDE_ENUM_INIT(_access_mode), \
                                                .type = { \
                                                        .attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                                                        .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                                .u = { \
                                        .side_string = { \
                                                .offset = _offset, \
-                                               .access_mode = _access_mode, \
+                                               .access_mode = SIDE_ENUM_INIT(_access_mode), \
                                                .type = { \
                                                        .attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                                                        .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                                .u = { \
                                        .side_struct = { \
                                                .offset = _offset, \
-                                               .access_mode = _access_mode, \
+                                               .access_mode = SIDE_ENUM_INIT(_access_mode), \
                                                .type = SIDE_PTR_INIT(_struct_gather), \
                                                .size = _size, \
                                        }, \
                                .u = { \
                                        .side_array = { \
                                                .offset = _offset, \
-                                               .access_mode = _access_mode, \
+                                               .access_mode = SIDE_ENUM_INIT(_access_mode), \
                                                .type = { \
                                                        .elem_type = SIDE_PTR_INIT(_elem_type_gather), \
                                                        .attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                        .side_gather = { \
                                .u = { \
                                        .side_vla = { \
-                                               .length_type = SIDE_PTR_INIT(_length_type_gather), \
                                                .offset = _offset, \
-                                               .access_mode = _access_mode, \
+                                               .access_mode = SIDE_ENUM_INIT(_access_mode), \
                                                .type = { \
                                                        .elem_type = SIDE_PTR_INIT(_elem_type_gather), \
+                                                       .length_type = SIDE_PTR_INIT(_length_type_gather), \
                                                        .attr = SIDE_PTR_INIT(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                                                        .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                                                }, \
index bf58380ef0f421060c2b3f85ed1fe564a59ff9c8..e0e9221a59e37700029a1c181d01ce7ae5dc9496 100644 (file)
@@ -24,7 +24,9 @@ libside_la_SOURCES = \
        side.c \
        tracer.c \
        visit-arg-vec.c \
-       visit-arg-vec.h
+       visit-arg-vec.h \
+       visit-description.c \
+       visit-description.h
 
 libside_la_LDFLAGS = -no-undefined -version-info $(SIDE_LIBRARY_VERSION)
 libside_la_LIBADD = \
index 1ed91f8bb0cc5730d6d5705944e86ed633862cd1..d8b58a851bdf8219fe2c5efe0746ccb060abd280 100644 (file)
@@ -188,7 +188,7 @@ void _side_call(const struct side_event_state *event_state, const struct side_ar
        if (side_unlikely(enabled & SIDE_EVENT_ENABLED_SHARED_MASK)) {
                if ((enabled & SIDE_EVENT_ENABLED_SHARED_USER_EVENT_MASK) &&
                    (key == SIDE_KEY_MATCH_ALL || key == SIDE_KEY_USER_EVENT)) {
-                       // TODO: call kernel write.
+                       // TODO: User event integration: call kernel write.
                }
                if ((enabled & SIDE_EVENT_ENABLED_SHARED_PTRACE_MASK) &&
                    (key == SIDE_KEY_MATCH_ALL || key == SIDE_KEY_PTRACE))
@@ -239,7 +239,7 @@ void _side_call_variadic(const struct side_event_state *event_state,
        if (side_unlikely(enabled & SIDE_EVENT_ENABLED_SHARED_MASK)) {
                if ((enabled & SIDE_EVENT_ENABLED_SHARED_USER_EVENT_MASK) &&
                    (key == SIDE_KEY_MATCH_ALL || key == SIDE_KEY_USER_EVENT)) {
-                       // TODO: call kernel write.
+                       // TODO: User event integration: call kernel write.
                }
                if ((enabled & SIDE_EVENT_ENABLED_SHARED_PTRACE_MASK) &&
                    (key == SIDE_KEY_MATCH_ALL || key == SIDE_KEY_PTRACE))
@@ -464,7 +464,7 @@ struct side_events_register_handle *side_events_register(struct side_event_descr
                        events, nr_events, tracer_handle->priv);
        }
        pthread_mutex_unlock(&side_event_lock);
-       //TODO: call event batch register ioctl
+       //TODO: User event integration: call event batch register ioctl
        return events_handle;
 }
 
@@ -529,7 +529,7 @@ void side_events_unregister(struct side_events_register_handle *events_handle)
                side_event_remove_callbacks(event);
        }
        pthread_mutex_unlock(&side_event_lock);
-       //TODO: call event batch unregister ioctl
+       //TODO: User event integration: call event batch unregister ioctl
        free(events_handle);
 }
 
index e79361604d5d4cc37035dd7fedefd13de43a1b34..d8d6ba91434101eb27e58f5ffb7fc30218f36b45 100644 (file)
 
 #include <side/trace.h>
 
+#include "visit-arg-vec.h"
+#include "visit-description.h"
+
 /* TODO: optionally print caller address. */
 static bool print_caller = false;
 
+#define MAX_NESTING    32
+
 enum tracer_display_base {
        TRACER_DISPLAY_BASE_2,
        TRACER_DISPLAY_BASE_8,
@@ -28,44 +33,16 @@ union int_value {
        int64_t s[NR_SIDE_INTEGER128_SPLIT];
 };
 
+struct print_ctx {
+       int nesting;                    /* Keep track of nesting, useful for tabulations. */
+       int item_nr[MAX_NESTING];       /* Item number in current nesting level, useful for comma-separated lists. */
+};
+
 static struct side_tracer_handle *tracer_handle;
 
 static uint64_t tracer_key;
 
-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);
-static
-void tracer_print_vla_visitor(const struct side_type *type_desc, struct side_arg_vla_visitor *vla_visitor);
-static
-void tracer_print_dynamic(const struct side_arg *dynamic_item, bool print_brackets);
-static
-uint32_t tracer_print_gather_bool_type(const struct side_type_gather *type_gather, const void *_ptr);
-static
-uint32_t tracer_print_gather_byte_type(const struct side_type_gather *type_gather, const void *_ptr);
-static
-uint32_t tracer_print_gather_integer_type(const struct side_type_gather *type_gather, const void *_ptr,
-               enum tracer_display_base default_base);
-static
-uint32_t tracer_print_gather_float_type(const struct side_type_gather *type_gather, const void *_ptr);
-static
-uint32_t tracer_print_gather_string_type(const struct side_type_gather *type_gather, const void *_ptr);
-static
-uint32_t tracer_print_gather_enum_type(const struct side_type_gather *type_gather, const void *_ptr);
-static
-uint32_t tracer_print_gather_struct(const struct side_type_gather *type_gather, const void *_ptr);
-static
-uint32_t tracer_print_gather_array(const struct side_type_gather *type_gather, const void *_ptr);
-static
-uint32_t tracer_print_gather_vla(const struct side_type_gather *type_gather, const void *_ptr,
-               const void *_length_ptr);
-static
-void tracer_print_type(const struct side_type *type_desc, const struct side_arg *item, bool print_brackets);
+static struct side_description_visitor description_visitor;
 
 static
 void tracer_convert_string_to_utf8(const void *p, uint8_t unit_size, enum side_type_label_byte_order byte_order,
@@ -177,7 +154,7 @@ void tracer_convert_string_to_utf8(const void *p, uint8_t unit_size, enum side_t
 }
 
 static
-void tracer_print_string(const void *p, uint8_t unit_size, enum side_type_label_byte_order byte_order,
+void tracer_print_type_string(const void *p, uint8_t unit_size, enum side_type_label_byte_order byte_order,
                size_t *strlen_with_null)
 {
        char *output_str = NULL;
@@ -400,7 +377,7 @@ void tracer_print_attr_type(const char *separator, const struct side_attr *attr)
                abort();
 #endif
        case SIDE_ATTR_TYPE_STRING:
-               tracer_print_string(side_ptr_get(attr->value.u.string_value.p),
+               tracer_print_type_string(side_ptr_get(attr->value.u.string_value.p),
                                attr->value.u.string_value.unit_size,
                                side_enum_get(attr->value.u.string_value.byte_order), NULL);
                break;
@@ -419,9 +396,9 @@ void print_attributes(const char *prefix_str, const char *separator,
 
        if (!nr_attr)
                return;
-       printf("%s%s [ ", prefix_str, separator);
+       printf("%s%s [", prefix_str, separator);
        for (i = 0; i < nr_attr; i++) {
-               printf("%s", i ? ", " : "");
+               printf("%s", i ? ", " : " ");
                tracer_print_attr_type(separator, &attr[i]);
        }
        printf(" ]");
@@ -574,7 +551,7 @@ void print_enum_labels(const struct side_enum_mappings *mappings, union int_valu
                }
                if (v.s[SIDE_INTEGER128_SPLIT_LOW] >= mapping->range_begin && v.s[SIDE_INTEGER128_SPLIT_LOW] <= mapping->range_end) {
                        printf("%s", print_count++ ? ", " : "");
-                       tracer_print_string(side_ptr_get(mapping->label.p), mapping->label.unit_size,
+                       tracer_print_type_string(side_ptr_get(mapping->label.p), mapping->label.unit_size,
                                side_enum_get(mapping->label.byte_order), NULL);
                }
        }
@@ -583,25 +560,6 @@ void print_enum_labels(const struct side_enum_mappings *mappings, union int_valu
        printf(" ]");
 }
 
-static
-void tracer_print_enum(const struct side_type *type_desc, const struct side_arg *item)
-{
-       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 int_value v;
-
-       if (side_enum_get(elem_type->type) != side_enum_get(item->type)) {
-               fprintf(stderr, "ERROR: Unexpected enum element type\n");
-               abort();
-       }
-       v = tracer_load_integer_value(&elem_type->u.side_integer,
-                       &item->u.side_static.integer_value, 0, NULL);
-       print_attributes("attr", ":", side_ptr_get(mappings->attr), mappings->nr_attr);
-       printf("%s", mappings->nr_attr ? ", " : "");
-       tracer_print_type(elem_type, item, true);
-       print_enum_labels(mappings, v);
-}
-
 static
 uint32_t elem_type_to_stride(const struct side_type *elem_type)
 {
@@ -630,94 +588,6 @@ uint32_t elem_type_to_stride(const struct side_type *elem_type)
        return stride_bit;
 }
 
-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 = 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;
-
-       switch (side_enum_get(enum_elem_type->type)) {
-       case SIDE_TYPE_U8:              /* Fall-through */
-       case SIDE_TYPE_BYTE:            /* Fall-through */
-       case SIDE_TYPE_U16:             /* Fall-through */
-       case SIDE_TYPE_U32:             /* Fall-through */
-       case SIDE_TYPE_U64:             /* Fall-through */
-       case SIDE_TYPE_U128:            /* Fall-through */
-       case SIDE_TYPE_S8:              /* Fall-through */
-       case SIDE_TYPE_S16:             /* Fall-through */
-       case SIDE_TYPE_S32:             /* Fall-through */
-       case SIDE_TYPE_S64:             /* Fall-through */
-       case SIDE_TYPE_S128:
-               elem_type = enum_elem_type;
-               array_item = item;
-               nr_items = 1;
-               break;
-       case SIDE_TYPE_ARRAY:
-               elem_type = side_ptr_get(enum_elem_type->u.side_array.elem_type);
-               array_item = side_ptr_get(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 = side_ptr_get(enum_elem_type->u.side_vla.elem_type);
-               array_item = side_ptr_get(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");
-               abort();
-       }
-       stride_bit = elem_type_to_stride(elem_type);
-
-       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_ptr_get(side_enum_mappings->mappings)[i];
-               bool match = false;
-               uint64_t bit;
-
-               if (mapping->range_end < mapping->range_begin) {
-                       fprintf(stderr, "ERROR: Unexpected enum bitmap range: %" PRIu64 "-%" PRIu64 "\n",
-                               mapping->range_begin, mapping->range_end);
-                       abort();
-               }
-               for (bit = mapping->range_begin; bit <= mapping->range_end; bit++) {
-                       if (bit > (nr_items * stride_bit) - 1)
-                               break;
-                       if (side_enum_get(elem_type->type) == SIDE_TYPE_BYTE) {
-                               uint8_t v = array_item[bit / 8].u.side_static.byte_value;
-                               if (v & (1ULL << (bit % 8))) {
-                                       match = true;
-                                       goto match;
-                               }
-                       } else {
-                               union int_value v = {};
-
-                               v = tracer_load_integer_value(&elem_type->u.side_integer,
-                                               &array_item[bit / stride_bit].u.side_static.integer_value,
-                                               0, NULL);
-                               side_check_value_u64(v);
-                               if (v.u[SIDE_INTEGER128_SPLIT_LOW] & (1ULL << (bit % stride_bit))) {
-                                       match = true;
-                                       goto match;
-                               }
-                       }
-               }
-match:
-               if (match) {
-                       printf("%s", print_count++ ? ", " : "");
-                       tracer_print_string(side_ptr_get(mapping->label.p), mapping->label.unit_size,
-                               side_enum_get(mapping->label.byte_order), NULL);
-               }
-       }
-       if (!print_count)
-               printf("<NO LABEL>");
-       printf(" ]");
-}
-
 static
 void print_integer_binary(uint64_t v[NR_SIDE_INTEGER128_SPLIT], int bits)
 {
@@ -741,12 +611,12 @@ void print_integer_binary(uint64_t v[NR_SIDE_INTEGER128_SPLIT], int bits)
 }
 
 static
-void tracer_print_type_header(const char *separator,
+void tracer_print_type_header(const char *prefix, const char *separator,
                const struct side_attr *attr, uint32_t nr_attr)
 {
        print_attributes("attr", separator, attr, nr_attr);
        printf("%s", nr_attr ? ", " : "");
-       printf("value%s ", separator);
+       printf("%s%s ", prefix, separator);
 }
 
 static
@@ -806,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, side_ptr_get(type_bool->attr), type_bool->nr_attr);
+       tracer_print_type_header("value", separator, side_ptr_get(type_bool->attr), type_bool->nr_attr);
        printf("%s", v ? "true" : "false");
 }
 
@@ -940,7 +810,7 @@ void tracer_print_type_integer(const char *separator,
        uint16_t len_bits;
 
        v = tracer_load_integer_value(type_integer, value, offset_bits, &len_bits);
-       tracer_print_type_header(separator, side_ptr_get(type_integer->attr), type_integer->nr_attr);
+       tracer_print_type_header("value", 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:
@@ -1009,7 +879,7 @@ void tracer_print_type_float(const char *separator,
 {
        bool reverse_bo;
 
-       tracer_print_type_header(separator, side_ptr_get(type_float->attr), type_float->nr_attr);
+       tracer_print_type_header("value", separator, side_ptr_get(type_float->attr), type_float->nr_attr);
        reverse_bo = side_enum_get(type_float->byte_order) != SIDE_TYPE_FLOAT_WORD_ORDER_HOST;
        switch (type_float->float_size) {
        case 2:
@@ -1095,1006 +965,1574 @@ void tracer_print_type_float(const char *separator,
 }
 
 static
-void tracer_print_type(const struct side_type *type_desc, const struct side_arg *item, bool print_brackets)
+void push_nesting(struct print_ctx *ctx)
 {
-       enum side_type_label type;
+       if (++ctx->nesting >= MAX_NESTING) {
+               fprintf(stderr, "ERROR: Nesting too deep.\n");
+               abort();
+       }
+       ctx->item_nr[ctx->nesting] = 0;
+}
 
-       switch (side_enum_get(type_desc->type)) {
-       case SIDE_TYPE_ENUM:
-               switch (side_enum_get(item->type)) {
-               case SIDE_TYPE_U8:
-               case SIDE_TYPE_U16:
-               case SIDE_TYPE_U32:
-               case SIDE_TYPE_U64:
-               case SIDE_TYPE_U128:
-               case SIDE_TYPE_S8:
-               case SIDE_TYPE_S16:
-               case SIDE_TYPE_S32:
-               case SIDE_TYPE_S64:
-               case SIDE_TYPE_S128:
-                       break;
-               default:
-                       fprintf(stderr, "ERROR: type mismatch between description and arguments\n");
-                       abort();
-                       break;
-               }
-               break;
+static
+void pop_nesting(struct print_ctx *ctx)
+{
+       ctx->item_nr[ctx->nesting] = 0;
+       if (ctx->nesting-- <= 0) {
+               fprintf(stderr, "ERROR: Nesting underflow.\n");
+               abort();
+       }
+}
 
-       case SIDE_TYPE_ENUM_BITMAP:
-               switch (side_enum_get(item->type)) {
-               case SIDE_TYPE_U8:
-               case SIDE_TYPE_BYTE:
-               case SIDE_TYPE_U16:
-               case SIDE_TYPE_U32:
-               case SIDE_TYPE_U64:
-               case SIDE_TYPE_U128:
-               case SIDE_TYPE_ARRAY:
-               case SIDE_TYPE_VLA:
-                       break;
-               default:
-                       fprintf(stderr, "ERROR: type mismatch between description and arguments\n");
-                       abort();
-                       break;
-               }
-               break;
+static
+int get_nested_item_nr(struct print_ctx *ctx)
+{
+       return ctx->item_nr[ctx->nesting];
+}
 
-       case SIDE_TYPE_GATHER_ENUM:
-               switch (side_enum_get(item->type)) {
-               case SIDE_TYPE_GATHER_INTEGER:
-                       break;
-               default:
-                       fprintf(stderr, "ERROR: type mismatch between description and arguments\n");
-                       abort();
-                       break;
-               }
-               break;
+static
+void inc_nested_item_nr(struct print_ctx *ctx)
+{
+       ctx->item_nr[ctx->nesting]++;
+}
 
-       case SIDE_TYPE_DYNAMIC:
-               switch (side_enum_get(item->type)) {
-               case SIDE_TYPE_DYNAMIC_NULL:
-               case SIDE_TYPE_DYNAMIC_BOOL:
-               case SIDE_TYPE_DYNAMIC_INTEGER:
-               case SIDE_TYPE_DYNAMIC_BYTE:
-               case SIDE_TYPE_DYNAMIC_POINTER:
-               case SIDE_TYPE_DYNAMIC_FLOAT:
-               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;
+static
+void tracer_before_print_event(const struct side_event_description *desc,
+               const struct side_arg_vec *side_arg_vec,
+               const struct side_arg_dynamic_struct *var_struct __attribute__((unused)),
+               void *caller_addr, void *priv __attribute__((unused)))
+{
+       uint32_t side_sav_len = side_arg_vec->len;
 
-       default:
-               if (side_enum_get(type_desc->type) != side_enum_get(item->type)) {
-                       fprintf(stderr, "ERROR: type mismatch between description and arguments\n");
-                       abort();
-               }
-               break;
+       if (desc->nr_fields != side_sav_len) {
+               fprintf(stderr, "ERROR: number of fields mismatch between description and arguments\n");
+               abort();
        }
 
-       if (side_enum_get(type_desc->type) == SIDE_TYPE_ENUM || side_enum_get(type_desc->type) == SIDE_TYPE_ENUM_BITMAP || side_enum_get(type_desc->type) == SIDE_TYPE_GATHER_ENUM)
-               type = side_enum_get(type_desc->type);
-       else
-               type = side_enum_get(item->type);
-
-       if (print_brackets)
-               printf("{ ");
-       switch (type) {
-               /* Stack-copy basic types */
-       case SIDE_TYPE_NULL:
-               tracer_print_type_header(":", side_ptr_get(type_desc->u.side_null.attr),
-                       type_desc->u.side_null.nr_attr);
-               printf("<NULL TYPE>");
-               break;
-
-       case SIDE_TYPE_BOOL:
-               tracer_print_type_bool(":", &type_desc->u.side_bool, &item->u.side_static.bool_value, 0);
-               break;
-
-       case SIDE_TYPE_U8:
-       case SIDE_TYPE_U16:
-       case SIDE_TYPE_U32:
-       case SIDE_TYPE_U64:
-       case SIDE_TYPE_U128:
-       case SIDE_TYPE_S8:
-       case SIDE_TYPE_S16:
-       case SIDE_TYPE_S32:
-       case SIDE_TYPE_S64:
-       case SIDE_TYPE_S128:
-               tracer_print_type_integer(":", &type_desc->u.side_integer, &item->u.side_static.integer_value, 0,
-                               TRACER_DISPLAY_BASE_10);
-               break;
+       if (print_caller)
+               printf("caller: [%p], ", caller_addr);
+       printf("provider: %s, event: %s",
+               side_ptr_get(desc->provider_name),
+               side_ptr_get(desc->event_name));
+       print_attributes(", attr", ":", side_ptr_get(desc->attr), desc->nr_attr);
+}
 
-       case SIDE_TYPE_BYTE:
-               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;
+static
+void tracer_after_print_event(const struct side_event_description *desc __attribute__((unused)),
+               const struct side_arg_vec *side_arg_vec __attribute__((unused)),
+               const struct side_arg_dynamic_struct *var_struct __attribute__((unused)),
+               void *caller_addr __attribute__((unused)), void *priv __attribute__((unused)))
+{
+       printf("\n");
+}
 
-       case SIDE_TYPE_POINTER:
-               tracer_print_type_integer(":", &type_desc->u.side_integer, &item->u.side_static.integer_value, 0,
-                               TRACER_DISPLAY_BASE_16);
-               break;
+static
+void tracer_before_print_static_fields(const struct side_arg_vec *side_arg_vec, void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+       uint32_t side_sav_len = side_arg_vec->len;
 
-       case SIDE_TYPE_FLOAT_BINARY16:
-       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.side_static.float_value);
-               break;
+       printf("%s", side_sav_len ? ", fields: {" : "");
+       push_nesting(ctx);
+}
 
-       case SIDE_TYPE_STRING_UTF8:
-       case SIDE_TYPE_STRING_UTF16:
-       case SIDE_TYPE_STRING_UTF32:
-               tracer_print_type_header(":", side_ptr_get(type_desc->u.side_string.attr), type_desc->u.side_string.nr_attr);
-               tracer_print_string(side_ptr_get(item->u.side_static.string_value),
-                               type_desc->u.side_string.unit_size, side_enum_get(type_desc->u.side_string.byte_order), NULL);
-               break;
 
-               /* Stack-copy compound types */
-       case SIDE_TYPE_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, side_ptr_get(item->u.side_static.side_array));
-               break;
-       case SIDE_TYPE_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, side_ptr_get(item->u.side_static.side_vla_visitor));
-               break;
+static
+void tracer_after_print_static_fields(const struct side_arg_vec *side_arg_vec, void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+       uint32_t side_sav_len = side_arg_vec->len;
 
-               /* Stack-copy enumeration types */
-       case SIDE_TYPE_ENUM:
-               tracer_print_enum(type_desc, item);
-               break;
-       case SIDE_TYPE_ENUM_BITMAP:
-               tracer_print_enum_bitmap(type_desc, item);
-               break;
+       pop_nesting(ctx);
+       if (side_sav_len)
+               printf(" }");
+}
 
-               /* Gather basic types */
-       case SIDE_TYPE_GATHER_BOOL:
-               (void) tracer_print_gather_bool_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_bool_gather_ptr));
-               break;
-       case SIDE_TYPE_GATHER_INTEGER:
-               (void) tracer_print_gather_integer_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_integer_gather_ptr),
-                                       TRACER_DISPLAY_BASE_10);
-               break;
-       case SIDE_TYPE_GATHER_BYTE:
-               (void) tracer_print_gather_byte_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_byte_gather_ptr));
-               break;
-       case SIDE_TYPE_GATHER_POINTER:
-               (void) tracer_print_gather_integer_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_integer_gather_ptr),
-                                       TRACER_DISPLAY_BASE_16);
-               break;
-       case SIDE_TYPE_GATHER_FLOAT:
-               (void) tracer_print_gather_float_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_float_gather_ptr));
-               break;
-       case SIDE_TYPE_GATHER_STRING:
-               (void) tracer_print_gather_string_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_string_gather_ptr));
-               break;
+static
+void tracer_before_print_variadic_fields(const struct side_arg_dynamic_struct *var_struct,
+               void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+       uint32_t var_struct_len = var_struct->len;
 
-               /* Gather compound type */
-       case SIDE_TYPE_GATHER_STRUCT:
-               (void) tracer_print_gather_struct(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_struct_gather_ptr));
-               break;
-       case SIDE_TYPE_GATHER_ARRAY:
-               (void) tracer_print_gather_array(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_array_gather_ptr));
-               break;
-       case SIDE_TYPE_GATHER_VLA:
-               (void) tracer_print_gather_vla(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_vla_gather.ptr),
-                               side_ptr_get(item->u.side_static.side_vla_gather.length_ptr));
-               break;
+       print_attributes(", attr ", "::", side_ptr_get(var_struct->attr), var_struct->nr_attr);
+       printf("%s", var_struct_len ? ", fields:: {" : "");
+       push_nesting(ctx);
+}
 
-               /* Gather enumeration types */
-       case SIDE_TYPE_GATHER_ENUM:
-               (void) tracer_print_gather_enum_type(&type_desc->u.side_gather, side_ptr_get(item->u.side_static.side_integer_gather_ptr));
-               break;
+static
+void tracer_after_print_variadic_fields(const struct side_arg_dynamic_struct *var_struct, void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+       uint32_t var_struct_len = var_struct->len;
 
-       /* Dynamic basic types */
-       case SIDE_TYPE_DYNAMIC_NULL:
-       case SIDE_TYPE_DYNAMIC_BOOL:
-       case SIDE_TYPE_DYNAMIC_INTEGER:
-       case SIDE_TYPE_DYNAMIC_BYTE:
-       case SIDE_TYPE_DYNAMIC_POINTER:
-       case SIDE_TYPE_DYNAMIC_FLOAT:
-       case SIDE_TYPE_DYNAMIC_STRING:
-
-       /* Dynamic compound types */
-       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, false);
-               break;
-       default:
-               fprintf(stderr, "<UNKNOWN TYPE>\n");
-               abort();
-       }
-       if (print_brackets)
+       pop_nesting(ctx);
+       if (var_struct_len)
                printf(" }");
 }
 
 static
-void tracer_print_field(const struct side_event_field *item_desc, const struct side_arg *item)
+void tracer_before_print_field(const struct side_event_field *item_desc, void *priv)
 {
-       printf("%s: ", side_ptr_get(item_desc->field_name));
-       tracer_print_type(&item_desc->side_type, item, true);
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       if (get_nested_item_nr(ctx) != 0)
+               printf(",");
+       printf(" %s: { ", side_ptr_get(item_desc->field_name));
 }
 
 static
-void tracer_print_struct(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec)
+void tracer_after_print_field(const struct side_event_field *item_desc __attribute__((unused)), void *priv)
 {
-       const struct side_arg *sav = side_ptr_get(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;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       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", ":", 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(&side_ptr_get(side_struct->fields)[i], &sav[i]);
-       }
        printf(" }");
+       inc_nested_item_nr(ctx);
 }
 
 static
-void tracer_print_variant(const struct side_type *type_desc, const struct side_arg_variant *side_arg_variant)
+void tracer_before_print_elem(const struct side_type *type_desc __attribute__((unused)), void *priv)
 {
-       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 int_value v;
-       uint32_t i;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       if (side_enum_get(selector_type->type) != side_enum_get(side_arg_variant->selector.type)) {
-               fprintf(stderr, "ERROR: Unexpected variant selector type\n");
-               abort();
-       }
-       switch (side_enum_get(selector_type->type)) {
-       case SIDE_TYPE_U8:
-       case SIDE_TYPE_U16:
-       case SIDE_TYPE_U32:
-       case SIDE_TYPE_U64:
-       case SIDE_TYPE_U128:
-       case SIDE_TYPE_S8:
-       case SIDE_TYPE_S16:
-       case SIDE_TYPE_S32:
-       case SIDE_TYPE_S64:
+       if (get_nested_item_nr(ctx) != 0)
+               printf(", { ");
+       else
+               printf(" { ");
+}
+
+static
+void tracer_after_print_elem(const struct side_type *type_desc __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       printf(" }");
+       inc_nested_item_nr(ctx);
+}
+
+static
+void tracer_print_null(const struct side_type *type_desc,
+               const struct side_arg *item __attribute__((unused)),
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("value", ":", side_ptr_get(type_desc->u.side_null.attr),
+               type_desc->u.side_null.nr_attr);
+       printf("<NULL TYPE>");
+}
+
+static
+void tracer_print_bool(const struct side_type *type_desc,
+               const struct side_arg *item,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_bool(":", &type_desc->u.side_bool, &item->u.side_static.bool_value, 0);
+}
+
+static
+void tracer_print_integer(const struct side_type *type_desc,
+               const struct side_arg *item,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_integer(":", &type_desc->u.side_integer, &item->u.side_static.integer_value, 0, TRACER_DISPLAY_BASE_10);
+}
+
+static
+void tracer_print_byte(const struct side_type *type_desc __attribute__((unused)),
+               const struct side_arg *item,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("value", ":", 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);
+}
+
+static
+void tracer_print_pointer(const struct side_type *type_desc,
+               const struct side_arg *item,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_integer(":", &type_desc->u.side_integer, &item->u.side_static.integer_value, 0, TRACER_DISPLAY_BASE_16);
+}
+
+static
+void tracer_print_float(const struct side_type *type_desc,
+               const struct side_arg *item,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_float(":", &type_desc->u.side_float, &item->u.side_static.float_value);
+}
+
+static
+void tracer_print_string(const struct side_type *type_desc,
+               const struct side_arg *item,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("value", ":", side_ptr_get(type_desc->u.side_string.attr), type_desc->u.side_string.nr_attr);
+       tracer_print_type_string(side_ptr_get(item->u.side_static.string_value),
+                       type_desc->u.side_string.unit_size,
+                       side_enum_get(type_desc->u.side_string.byte_order), NULL);
+}
+
+static
+void tracer_before_print_struct(const struct side_type_struct *side_struct,
+       const struct side_arg_vec *side_arg_vec __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       print_attributes("attr", ":", side_ptr_get(side_struct->attr), side_struct->nr_attr);
+       printf("%s", side_struct->nr_attr ? ", " : "");
+       printf("fields: {");
+       push_nesting(ctx);
+}
+
+
+static
+void tracer_after_print_struct(const struct side_type_struct *side_struct __attribute__((unused)),
+       const struct side_arg_vec *side_arg_vec __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       pop_nesting(ctx);
+       printf(" }");
+}
+
+static
+void tracer_before_print_array(const struct side_type_array *side_array,
+       const struct side_arg_vec *side_arg_vec __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       print_attributes("attr", ":", side_ptr_get(side_array->attr), side_array->nr_attr);
+       printf("%s", side_array->nr_attr ? ", " : "");
+       printf("elements: [");
+       push_nesting(ctx);
+}
+
+static
+void tracer_after_print_array(const struct side_type_array *side_array __attribute__((unused)),
+       const struct side_arg_vec *side_arg_vec __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       pop_nesting(ctx);
+       printf(" ]");
+}
+
+static
+void do_tracer_before_print_vla(const struct side_type_vla *side_vla,
+       const struct side_arg_vec *side_arg_vec __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       print_attributes("attr", ":", side_ptr_get(side_vla->attr), side_vla->nr_attr);
+       printf("%s", side_vla->nr_attr ? ", " : "");
+       printf("elements: [");
+       push_nesting(ctx);
+}
+
+
+static
+void do_tracer_after_print_vla(const struct side_type_vla *side_vla __attribute__((unused)),
+       const struct side_arg_vec *side_arg_vec __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       pop_nesting(ctx);
+       printf(" ]");
+}
+
+static
+void tracer_before_print_vla(const struct side_type_vla *side_vla,
+       const struct side_arg_vec *side_arg_vec, void *priv)
+{
+       switch (side_enum_get(side_ptr_get(side_vla->length_type)->type)) {
+       case SIDE_TYPE_U8:              /* Fall-through */
+       case SIDE_TYPE_U16:             /* Fall-through */
+       case SIDE_TYPE_U32:             /* Fall-through */
+       case SIDE_TYPE_U64:             /* Fall-through */
+       case SIDE_TYPE_U128:            /* Fall-through */
+       case SIDE_TYPE_S8:              /* Fall-through */
+       case SIDE_TYPE_S16:             /* Fall-through */
+       case SIDE_TYPE_S32:             /* Fall-through */
+       case SIDE_TYPE_S64:             /* Fall-through */
        case SIDE_TYPE_S128:
                break;
        default:
-               fprintf(stderr, "ERROR: Expecting integer variant selector type\n");
+               fprintf(stderr, "ERROR: Unexpected vla length type\n");
                abort();
        }
-       v = tracer_load_integer_value(&selector_type->u.side_integer,
-                       &side_arg_variant->selector.u.side_static.integer_value, 0, NULL);
-       side_check_value_u64(v);
-       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 (v.s[SIDE_INTEGER128_SPLIT_LOW] >= option->range_begin && v.s[SIDE_INTEGER128_SPLIT_LOW] <= option->range_end) {
-                       tracer_print_type(&option->side_type, &side_arg_variant->option, false);
-                       return;
-               }
-       }
-       fprintf(stderr, "ERROR: Variant selector value unknown %" PRId64 "\n", v.s[SIDE_INTEGER128_SPLIT_LOW]);
-       abort();
+       do_tracer_before_print_vla(side_vla, side_arg_vec, priv);
+}
+
+static
+void tracer_after_print_vla(const struct side_type_vla *side_vla,
+       const struct side_arg_vec *side_arg_vec, void *priv)
+{
+       do_tracer_after_print_vla(side_vla, side_arg_vec, priv);
 }
 
 static
-void tracer_print_array(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec)
+void tracer_before_print_vla_visitor(const struct side_type_vla_visitor *side_vla_visitor,
+       const struct side_arg_vla_visitor *side_arg_vla_visitor __attribute__((unused)), void *priv)
 {
-       const struct side_arg *sav = side_ptr_get(side_arg_vec->sav);
-       uint32_t i, side_sav_len = side_arg_vec->len;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       if (type_desc->u.side_array.length != side_sav_len) {
-               fprintf(stderr, "ERROR: length mismatch between description and arguments of array\n");
+       switch (side_enum_get(side_ptr_get(side_vla_visitor->length_type)->type)) {
+       case SIDE_TYPE_U8:              /* Fall-through */
+       case SIDE_TYPE_U16:             /* Fall-through */
+       case SIDE_TYPE_U32:             /* Fall-through */
+       case SIDE_TYPE_U64:             /* Fall-through */
+       case SIDE_TYPE_U128:            /* Fall-through */
+       case SIDE_TYPE_S8:              /* Fall-through */
+       case SIDE_TYPE_S16:             /* Fall-through */
+       case SIDE_TYPE_S32:             /* Fall-through */
+       case SIDE_TYPE_S64:             /* Fall-through */
+       case SIDE_TYPE_S128:
+               break;
+       default:
+               fprintf(stderr, "ERROR: Unexpected vla visitor length type\n");
                abort();
        }
-       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(side_ptr_get(type_desc->u.side_array.elem_type), &sav[i], true);
-       }
-       printf(" ]");
+
+       print_attributes("attr", ":", side_ptr_get(side_vla_visitor->attr), side_vla_visitor->nr_attr);
+       printf("%s", side_vla_visitor->nr_attr ? ", " : "");
+       printf("elements: [");
+       push_nesting(ctx);
 }
 
 static
-void tracer_print_vla(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec)
+void tracer_after_print_vla_visitor(const struct side_type_vla_visitor *side_vla_visitor __attribute__((unused)),
+       const struct side_arg_vla_visitor *side_arg_vla_visitor __attribute__((unused)), void *priv)
 {
-       const struct side_arg *sav = side_ptr_get(side_arg_vec->sav);
-       uint32_t i, side_sav_len = side_arg_vec->len;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       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(side_ptr_get(type_desc->u.side_vla.elem_type), &sav[i], true);
-       }
+       pop_nesting(ctx);
        printf(" ]");
 }
 
-static
-const char *tracer_gather_access(enum side_type_gather_access_mode access_mode, const char *ptr)
+static void tracer_print_enum(const struct side_type *type_desc,
+       const struct side_arg *item, void *priv)
+{
+       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 int_value v;
+
+       if (side_enum_get(elem_type->type) != side_enum_get(item->type)) {
+               fprintf(stderr, "ERROR: Unexpected enum element type\n");
+               abort();
+       }
+       v = tracer_load_integer_value(&elem_type->u.side_integer,
+                       &item->u.side_static.integer_value, 0, NULL);
+       print_attributes("attr", ":", side_ptr_get(mappings->attr), mappings->nr_attr);
+       printf("%s", mappings->nr_attr ? ", " : "");
+       printf("{ ");
+       tracer_print_integer(elem_type, item, priv);
+       printf(" }");
+       print_enum_labels(mappings, v);
+}
+
+static void tracer_print_enum_bitmap(const struct side_type *type_desc,
+       const struct side_arg *item, void *priv __attribute__((unused)))
 {
-       switch (access_mode) {
-       case SIDE_TYPE_GATHER_ACCESS_DIRECT:
-               return ptr;
-       case SIDE_TYPE_GATHER_ACCESS_POINTER:
-               /* Dereference pointer */
-               memcpy(&ptr, ptr, sizeof(const char *));
-               return ptr;
+       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;
+
+       switch (side_enum_get(enum_elem_type->type)) {
+       case SIDE_TYPE_U8:              /* Fall-through */
+       case SIDE_TYPE_BYTE:            /* Fall-through */
+       case SIDE_TYPE_U16:             /* Fall-through */
+       case SIDE_TYPE_U32:             /* Fall-through */
+       case SIDE_TYPE_U64:             /* Fall-through */
+       case SIDE_TYPE_U128:            /* Fall-through */
+       case SIDE_TYPE_S8:              /* Fall-through */
+       case SIDE_TYPE_S16:             /* Fall-through */
+       case SIDE_TYPE_S32:             /* Fall-through */
+       case SIDE_TYPE_S64:             /* Fall-through */
+       case SIDE_TYPE_S128:
+               elem_type = enum_elem_type;
+               array_item = item;
+               nr_items = 1;
+               break;
+       case SIDE_TYPE_ARRAY:
+               elem_type = side_ptr_get(enum_elem_type->u.side_array.elem_type);
+               array_item = side_ptr_get(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 = side_ptr_get(enum_elem_type->u.side_vla.elem_type);
+               array_item = side_ptr_get(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");
                abort();
        }
+       stride_bit = elem_type_to_stride(elem_type);
+
+       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_ptr_get(side_enum_mappings->mappings)[i];
+               bool match = false;
+               uint64_t bit;
+
+               if (mapping->range_end < mapping->range_begin) {
+                       fprintf(stderr, "ERROR: Unexpected enum bitmap range: %" PRIu64 "-%" PRIu64 "\n",
+                               mapping->range_begin, mapping->range_end);
+                       abort();
+               }
+               for (bit = mapping->range_begin; bit <= mapping->range_end; bit++) {
+                       if (bit > (nr_items * stride_bit) - 1)
+                               break;
+                       if (side_enum_get(elem_type->type) == SIDE_TYPE_BYTE) {
+                               uint8_t v = array_item[bit / 8].u.side_static.byte_value;
+                               if (v & (1ULL << (bit % 8))) {
+                                       match = true;
+                                       goto match;
+                               }
+                       } else {
+                               union int_value v = {};
+
+                               v = tracer_load_integer_value(&elem_type->u.side_integer,
+                                               &array_item[bit / stride_bit].u.side_static.integer_value,
+                                               0, NULL);
+                               side_check_value_u64(v);
+                               if (v.u[SIDE_INTEGER128_SPLIT_LOW] & (1ULL << (bit % stride_bit))) {
+                                       match = true;
+                                       goto match;
+                               }
+                       }
+               }
+match:
+               if (match) {
+                       printf("%s", print_count++ ? ", " : "");
+                       tracer_print_type_string(side_ptr_get(mapping->label.p), mapping->label.unit_size,
+                               side_enum_get(mapping->label.byte_order), NULL);
+               }
+       }
+       if (!print_count)
+               printf("<NO LABEL>");
+       printf(" ]");
+}
+
+static
+void tracer_print_gather_bool(const struct side_type_gather_bool *type,
+       const union side_bool_value *value,
+       void *priv __attribute__((unused)))
+{
+       tracer_print_type_bool(":", &type->type, value, type->offset_bits);
+}
+
+static
+void tracer_print_gather_byte(const struct side_type_gather_byte *type,
+       const uint8_t *_ptr,
+       void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("value", ":", side_ptr_get(type->type.attr),
+                       type->type.nr_attr);
+       printf("0x%" PRIx8, *_ptr);
+}
+
+static
+void tracer_print_gather_integer(const struct side_type_gather_integer *type,
+       const union side_integer_value *value,
+       void *priv __attribute__((unused)))
+{
+       tracer_print_type_integer(":", &type->type, value, type->offset_bits, TRACER_DISPLAY_BASE_10);
+}
+
+static
+void tracer_print_gather_pointer(const struct side_type_gather_integer *type,
+       const union side_integer_value *value,
+       void *priv __attribute__((unused)))
+{
+       tracer_print_type_integer(":", &type->type, value, type->offset_bits, TRACER_DISPLAY_BASE_16);
+}
+
+static
+void tracer_print_gather_float(const struct side_type_gather_float *type,
+       const union side_float_value *value,
+       void *priv __attribute__((unused)))
+{
+       tracer_print_type_float(":", &type->type, value);
+}
+
+static
+void tracer_print_gather_string(const struct side_type_gather_string *type,
+       const void *p, uint8_t unit_size,
+       enum side_type_label_byte_order byte_order,
+       size_t strlen_with_null __attribute__((unused)),
+       void *priv __attribute__((unused)))
+{
+       //TODO use strlen_with_null input
+       tracer_print_type_header("value", ":", side_ptr_get(type->type.attr),
+                       type->type.nr_attr);
+       tracer_print_type_string(p, unit_size, byte_order, NULL);
+}
+
+static
+void tracer_before_print_gather_struct(const struct side_type_struct *side_struct, void *priv)
+{
+       tracer_before_print_struct(side_struct, NULL, priv);
+}
+
+static
+void tracer_after_print_gather_struct(const struct side_type_struct *side_struct, void *priv)
+{
+       tracer_after_print_struct(side_struct, NULL, priv);
+}
+
+static
+void tracer_before_print_gather_array(const struct side_type_array *side_array, void *priv)
+{
+       tracer_before_print_array(side_array, NULL, priv);
+}
+
+static
+void tracer_after_print_gather_array(const struct side_type_array *side_array, void *priv)
+{
+       tracer_after_print_array(side_array, NULL, priv);
 }
 
 static
-uint32_t tracer_gather_size(enum side_type_gather_access_mode access_mode, uint32_t len)
+void tracer_before_print_gather_vla(const struct side_type_vla *side_vla,
+       uint32_t length __attribute__((unused)), void *priv)
 {
-       switch (access_mode) {
-       case SIDE_TYPE_GATHER_ACCESS_DIRECT:
-               return len;
-       case SIDE_TYPE_GATHER_ACCESS_POINTER:
-               return sizeof(void *);
+       switch (side_enum_get(side_ptr_get(side_vla->length_type)->type)) {
+       case SIDE_TYPE_GATHER_INTEGER:
+               break;
        default:
+               fprintf(stderr, "ERROR: Unexpected vla length type\n");
                abort();
        }
+       do_tracer_before_print_vla(side_vla, NULL, priv);
 }
 
+
+static
+void tracer_after_print_gather_vla(const struct side_type_vla *side_vla,
+       uint32_t length __attribute__((unused)), void *priv)
+{
+       do_tracer_after_print_vla(side_vla, NULL, priv);
+}
+
+static
+void tracer_print_gather_enum(const struct side_type_gather_enum *type,
+       const union side_integer_value *value,
+       void *priv __attribute__((unused)))
+{
+       const struct side_enum_mappings *mappings = side_ptr_get(type->mappings);
+       const struct side_type *enum_elem_type = side_ptr_get(type->elem_type);
+       const struct side_type_gather_integer *side_integer = &enum_elem_type->u.side_gather.u.side_integer;
+       union int_value v;
+
+       v = tracer_load_integer_value(&side_integer->type, value, 0, NULL);
+       print_attributes("attr", ":", side_ptr_get(mappings->attr), mappings->nr_attr);
+       printf("%s", mappings->nr_attr ? ", " : "");
+       printf("{ ");
+       tracer_print_type_integer(":", &side_integer->type, value, 0, TRACER_DISPLAY_BASE_10);
+       printf(" }");
+       print_enum_labels(mappings, v);
+}
+
+static
+void tracer_before_print_dynamic_field(const struct side_arg_dynamic_field *field, void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       if (get_nested_item_nr(ctx) != 0)
+               printf(",");
+       printf(" %s:: { ", side_ptr_get(field->field_name));
+}
+
+static
+void tracer_after_print_dynamic_field(const struct side_arg_dynamic_field *field __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       printf(" }");
+       inc_nested_item_nr(ctx);
+}
+
+static
+void tracer_before_print_dynamic_elem(const struct side_arg *dynamic_item __attribute__((unused)), void *priv)
+{
+       tracer_before_print_elem(NULL, priv);
+}
+
+static
+void tracer_after_print_dynamic_elem(const struct side_arg *dynamic_item __attribute__((unused)), void *priv)
+{
+       tracer_after_print_elem(NULL, priv);
+}
+
+static
+void tracer_print_dynamic_null(const struct side_arg *item,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("value", "::", side_ptr_get(item->u.side_dynamic.side_null.attr),
+               item->u.side_dynamic.side_null.nr_attr);
+       printf("<NULL TYPE>");
+}
+
+static
+void tracer_print_dynamic_bool(const struct side_arg *item,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_bool("::", &item->u.side_dynamic.side_bool.type, &item->u.side_dynamic.side_bool.value, 0);
+}
+
+static
+void tracer_print_dynamic_integer(const struct side_arg *item,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_integer("::", &item->u.side_dynamic.side_integer.type, &item->u.side_dynamic.side_integer.value, 0,
+                       TRACER_DISPLAY_BASE_10);
+}
+
+static
+void tracer_print_dynamic_byte(const struct side_arg *item,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("value", "::", 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);
+}
+
+static
+void tracer_print_dynamic_pointer(const struct side_arg *item,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_integer("::", &item->u.side_dynamic.side_integer.type, &item->u.side_dynamic.side_integer.value, 0,
+                       TRACER_DISPLAY_BASE_16);
+}
+
+static
+void tracer_print_dynamic_float(const struct side_arg *item,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_float("::", &item->u.side_dynamic.side_float.type,
+                       &item->u.side_dynamic.side_float.value);
+}
+
+static
+void tracer_print_dynamic_string(const struct side_arg *item,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("value", "::", side_ptr_get(item->u.side_dynamic.side_string.type.attr), item->u.side_dynamic.side_string.type.nr_attr);
+       tracer_print_type_string((const char *)(uintptr_t) item->u.side_dynamic.side_string.value,
+                       item->u.side_dynamic.side_string.type.unit_size,
+                       side_enum_get(item->u.side_dynamic.side_string.type.byte_order), NULL);
+}
+
+static
+void tracer_before_print_dynamic_struct(const struct side_arg_dynamic_struct *dynamic_struct,
+       void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       print_attributes("attr", "::", side_ptr_get(dynamic_struct->attr), dynamic_struct->nr_attr);
+       printf("%s", dynamic_struct->nr_attr ? ", " : "");
+       printf("fields:: {");
+       push_nesting(ctx);
+}
+
+static
+void tracer_after_print_dynamic_struct(const struct side_arg_dynamic_struct *dynamic_struct __attribute__((unused)),
+       void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       pop_nesting(ctx);
+       printf(" }");
+}
+
+static
+void tracer_before_print_dynamic_struct_visitor(const struct side_arg *item, void *priv)
+{
+       struct side_arg_dynamic_struct_visitor *dynamic_struct_visitor;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       dynamic_struct_visitor = side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor);
+       if (!dynamic_struct_visitor)
+               abort();
+
+       print_attributes("attr", "::", side_ptr_get(dynamic_struct_visitor->attr), dynamic_struct_visitor->nr_attr);
+       printf("%s", dynamic_struct_visitor->nr_attr ? ", " : "");
+       printf("fields:: {");
+       push_nesting(ctx);
+}
+
+static
+void tracer_after_print_dynamic_struct_visitor(const struct side_arg *item, void *priv)
+{
+       struct side_arg_dynamic_struct_visitor *dynamic_struct_visitor;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       dynamic_struct_visitor = side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor);
+       if (!dynamic_struct_visitor)
+               abort();
+
+       pop_nesting(ctx);
+       printf(" }");
+}
+
+static
+void tracer_before_print_dynamic_vla(const struct side_arg_dynamic_vla *dynamic_vla, void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       print_attributes("attr", "::", side_ptr_get(dynamic_vla->attr), dynamic_vla->nr_attr);
+       printf("%s", dynamic_vla->nr_attr ? ", " : "");
+       printf("elements:: [");
+       push_nesting(ctx);
+}
+
+static
+void tracer_after_print_dynamic_vla(const struct side_arg_dynamic_vla *dynamic_vla __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       pop_nesting(ctx);
+       printf(" ]");
+}
+
+static
+void tracer_before_print_dynamic_vla_visitor(const struct side_arg *item, void *priv)
+{
+       struct side_arg_dynamic_vla_visitor *dynamic_vla_visitor;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       dynamic_vla_visitor = side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor);
+       if (!dynamic_vla_visitor)
+               abort();
+
+       print_attributes("attr", "::", side_ptr_get(dynamic_vla_visitor->attr), dynamic_vla_visitor->nr_attr);
+       printf("%s", dynamic_vla_visitor->nr_attr ? ", " : "");
+       printf("elements:: [");
+       push_nesting(ctx);
+}
+
+static
+void tracer_after_print_dynamic_vla_visitor(const struct side_arg *item, void *priv)
+{
+       struct side_arg_dynamic_vla_visitor *dynamic_vla_visitor;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       dynamic_vla_visitor = side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor);
+       if (!dynamic_vla_visitor)
+               abort();
+
+       pop_nesting(ctx);
+       printf(" ]");
+}
+
+static struct side_type_visitor type_visitor = {
+       .before_event_func = tracer_before_print_event,
+       .after_event_func = tracer_after_print_event,
+       .before_static_fields_func = tracer_before_print_static_fields,
+       .after_static_fields_func = tracer_after_print_static_fields,
+       .before_variadic_fields_func = tracer_before_print_variadic_fields,
+       .after_variadic_fields_func = tracer_after_print_variadic_fields,
+
+       /* Stack-copy basic types. */
+       .before_field_func = tracer_before_print_field,
+       .after_field_func = tracer_after_print_field,
+       .before_elem_func = tracer_before_print_elem,
+       .after_elem_func = tracer_after_print_elem,
+       .null_type_func = tracer_print_null,
+       .bool_type_func = tracer_print_bool,
+       .integer_type_func = tracer_print_integer,
+       .byte_type_func = tracer_print_byte,
+       .pointer_type_func = tracer_print_pointer,
+       .float_type_func = tracer_print_float,
+       .string_type_func = tracer_print_string,
+
+       /* Stack-copy compound types. */
+       .before_struct_type_func = tracer_before_print_struct,
+       .after_struct_type_func = tracer_after_print_struct,
+       .before_array_type_func = tracer_before_print_array,
+       .after_array_type_func = tracer_after_print_array,
+       .before_vla_type_func = tracer_before_print_vla,
+       .after_vla_type_func = tracer_after_print_vla,
+       .before_vla_visitor_type_func = tracer_before_print_vla_visitor,
+       .after_vla_visitor_type_func = tracer_after_print_vla_visitor,
+
+       /* Stack-copy enumeration types. */
+       .enum_type_func = tracer_print_enum,
+       .enum_bitmap_type_func = tracer_print_enum_bitmap,
+
+       /* Gather basic types. */
+       .gather_bool_type_func = tracer_print_gather_bool,
+       .gather_byte_type_func = tracer_print_gather_byte,
+       .gather_integer_type_func = tracer_print_gather_integer,
+       .gather_pointer_type_func = tracer_print_gather_pointer,
+       .gather_float_type_func = tracer_print_gather_float,
+       .gather_string_type_func = tracer_print_gather_string,
+
+       /* Gather compound types. */
+       .before_gather_struct_type_func = tracer_before_print_gather_struct,
+       .after_gather_struct_type_func = tracer_after_print_gather_struct,
+       .before_gather_array_type_func = tracer_before_print_gather_array,
+       .after_gather_array_type_func = tracer_after_print_gather_array,
+       .before_gather_vla_type_func = tracer_before_print_gather_vla,
+       .after_gather_vla_type_func = tracer_after_print_gather_vla,
+
+       /* Gather enumeration types. */
+       .gather_enum_type_func = tracer_print_gather_enum,
+
+       /* Dynamic basic types. */
+       .before_dynamic_field_func = tracer_before_print_dynamic_field,
+       .after_dynamic_field_func = tracer_after_print_dynamic_field,
+       .before_dynamic_elem_func = tracer_before_print_dynamic_elem,
+       .after_dynamic_elem_func = tracer_after_print_dynamic_elem,
+
+       .dynamic_null_func = tracer_print_dynamic_null,
+       .dynamic_bool_func = tracer_print_dynamic_bool,
+       .dynamic_integer_func = tracer_print_dynamic_integer,
+       .dynamic_byte_func = tracer_print_dynamic_byte,
+       .dynamic_pointer_func = tracer_print_dynamic_pointer,
+       .dynamic_float_func = tracer_print_dynamic_float,
+       .dynamic_string_func = tracer_print_dynamic_string,
+
+       /* Dynamic compound types. */
+       .before_dynamic_struct_func = tracer_before_print_dynamic_struct,
+       .after_dynamic_struct_func = tracer_after_print_dynamic_struct,
+       .before_dynamic_struct_visitor_func = tracer_before_print_dynamic_struct_visitor,
+       .after_dynamic_struct_visitor_func = tracer_after_print_dynamic_struct_visitor,
+       .before_dynamic_vla_func = tracer_before_print_dynamic_vla,
+       .after_dynamic_vla_func = tracer_after_print_dynamic_vla,
+       .before_dynamic_vla_visitor_func = tracer_before_print_dynamic_vla_visitor,
+       .after_dynamic_vla_visitor_func = tracer_after_print_dynamic_vla_visitor,
+};
+
+static
+void tracer_call(const struct side_event_description *desc,
+               const struct side_arg_vec *side_arg_vec,
+               void *priv __attribute__((unused)),
+               void *caller_addr)
+{
+       struct print_ctx ctx = {};
+
+       type_visitor_event(&type_visitor, desc, side_arg_vec, NULL, caller_addr, &ctx);
+}
+
+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,
+               void *priv __attribute__((unused)),
+               void *caller_addr)
+{
+       struct print_ctx ctx = {};
+
+       type_visitor_event(&type_visitor, desc, side_arg_vec, var_struct, caller_addr, &ctx);
+}
+
+static
+void before_print_description_event(const struct side_event_description *desc, void *priv __attribute__((unused)))
+{
+       printf("event description: provider: %s, event: %s", side_ptr_get(desc->provider_name), side_ptr_get(desc->event_name));
+       print_attributes(", attr", ":", side_ptr_get(desc->attr), desc->nr_attr);
+}
+
+static
+void after_print_description_event(const struct side_event_description *desc, void *priv __attribute__((unused)))
+{
+       if (desc->flags & SIDE_EVENT_FLAG_VARIADIC)
+               printf(", <variadic fields>");
+       printf("\n");
+}
+
+static
+void before_print_description_static_fields(const struct side_event_description *desc, void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+       uint32_t len = desc->nr_fields;
+
+       printf("%s", len ? ", fields: {" : "");
+       push_nesting(ctx);
+}
+
+static
+void after_print_description_static_fields(const struct side_event_description *desc, void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+       uint32_t len = desc->nr_fields;
+
+       pop_nesting(ctx);
+       if (len)
+               printf(" }");
+}
+
+static
+void before_print_description_field(const struct side_event_field *item_desc, void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       if (get_nested_item_nr(ctx) != 0)
+               printf(",");
+       printf(" %s: { ", side_ptr_get(item_desc->field_name));
+}
+
+static
+void after_print_description_field(const struct side_event_field *item_desc __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       printf(" }");
+       inc_nested_item_nr(ctx);
+}
+
+static
+void before_print_description_elem(const struct side_type *type_desc __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       if (get_nested_item_nr(ctx) != 0)
+               printf(", { ");
+       else
+               printf(" { ");
+}
+
+static
+void after_print_description_elem(const struct side_type *type_desc __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       printf(" }");
+       inc_nested_item_nr(ctx);
+}
+
+static
+void before_print_description_option(const struct side_variant_option *option_desc, void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       if (get_nested_item_nr(ctx) != 0)
+               printf(",");
+       if (option_desc->range_begin == option_desc->range_end)
+               printf(" [ %" PRIu64 " ]: { ",
+                       option_desc->range_begin);
+       else
+               printf(" [ %" PRIu64 " - %" PRIu64 " ]: { ",
+                       option_desc->range_begin,
+                       option_desc->range_end);
+}
+
+static
+void after_print_description_option(const struct side_variant_option *option_desc __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       printf(" }");
+       inc_nested_item_nr(ctx);
+}
+
+static
+void print_description_null(const struct side_type *type_desc,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("type", ":", side_ptr_get(type_desc->u.side_null.attr),
+               type_desc->u.side_null.nr_attr);
+       printf("null");
+}
+
+static
+void print_description_bool(const struct side_type *type_desc,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("type", ":", side_ptr_get(type_desc->u.side_bool.attr),
+               type_desc->u.side_bool.nr_attr);
+       printf("bool { size: %" PRIu16, type_desc->u.side_bool.bool_size);
+       if (type_desc->u.side_bool.len_bits)
+               printf(", len_bits: %" PRIu16, type_desc->u.side_bool.len_bits);
+       printf(" }");
+}
+
+static
+void print_description_integer(const struct side_type *type_desc,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("type", ":", side_ptr_get(type_desc->u.side_integer.attr),
+               type_desc->u.side_integer.nr_attr);
+       printf("integer { size: %" PRIu16 ", signedness: %s, byte_order: \"%s\"",
+               type_desc->u.side_integer.integer_size,
+               type_desc->u.side_integer.signedness ? "true" : "false",
+               side_enum_get(type_desc->u.side_integer.byte_order) == SIDE_TYPE_BYTE_ORDER_LE ? "le" : "be");
+       if (type_desc->u.side_integer.len_bits)
+               printf(", len_bits: %" PRIu16, type_desc->u.side_integer.len_bits);
+       printf(" }");
+}
+
+static
+void print_description_byte(const struct side_type *type_desc,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("type", ":", side_ptr_get(type_desc->u.side_byte.attr),
+               type_desc->u.side_byte.nr_attr);
+       printf("byte");
+}
+
+static
+void print_description_pointer(const struct side_type *type_desc,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("type", ":", side_ptr_get(type_desc->u.side_integer.attr),
+               type_desc->u.side_integer.nr_attr);
+       printf("pointer { size: %" PRIu16 ", signedness: %s, byte_order: \"%s\"",
+               type_desc->u.side_integer.integer_size,
+               type_desc->u.side_integer.signedness ? "true" : "false",
+               side_enum_get(type_desc->u.side_integer.byte_order) == SIDE_TYPE_BYTE_ORDER_LE ? "le" : "be");
+       if (type_desc->u.side_integer.len_bits)
+               printf(", len_bits: %" PRIu16, type_desc->u.side_integer.len_bits);
+       printf(" }");
+}
+
+static
+void print_description_float(const struct side_type *type_desc,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("type", ":", side_ptr_get(type_desc->u.side_float.attr),
+               type_desc->u.side_float.nr_attr);
+       printf("float { size: %" PRIu16 ", byte_order: \"%s\"",
+               type_desc->u.side_float.float_size,
+               side_enum_get(type_desc->u.side_float.byte_order) == SIDE_TYPE_BYTE_ORDER_LE ? "le" : "be");
+       printf(" }");
+}
+
+static
+void print_description_string(const struct side_type *type_desc,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("type", ":", side_ptr_get(type_desc->u.side_string.attr),
+               type_desc->u.side_string.nr_attr);
+       printf("string { unit_size: %" PRIu8,
+               type_desc->u.side_string.unit_size);
+       if (type_desc->u.side_string.unit_size > 1)
+               printf(", byte_order: \"%s\"",
+                       side_enum_get(type_desc->u.side_string.byte_order) == SIDE_TYPE_BYTE_ORDER_LE ? "le" : "be");
+       printf(" }");
+}
+
+static
+void before_print_description_struct(const struct side_type_struct *side_struct, void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       print_attributes("attr", ":", side_ptr_get(side_struct->attr), side_struct->nr_attr);
+       printf("%s", side_struct->nr_attr ? ", " : "");
+       printf("type: struct { fields: {");
+       push_nesting(ctx);
+}
+
+
 static
-union int_value tracer_load_gather_integer_value(const struct side_type_gather_integer *side_integer,
-               const void *_ptr)
+void after_print_description_struct(const struct side_type_struct *side_struct __attribute__((unused)), void *priv)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) side_integer->access_mode;
-       uint32_t integer_size_bytes = side_integer->type.integer_size;
-       const char *ptr = (const char *) _ptr;
-       union side_integer_value value;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       ptr = tracer_gather_access(access_mode, ptr + side_integer->offset);
-       memcpy(&value, ptr, integer_size_bytes);
-       return tracer_load_integer_value(&side_integer->type, &value,
-                       side_integer->offset_bits, NULL);
+       pop_nesting(ctx);
+       printf(" } }");
 }
 
 static
-uint32_t tracer_print_gather_bool_type(const struct side_type_gather *type_gather, const void *_ptr)
+void before_print_description_variant(const struct side_type_variant *side_variant, void *priv)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_bool.access_mode;
-       uint32_t bool_size_bytes = type_gather->u.side_bool.type.bool_size;
-       const char *ptr = (const char *) _ptr;
-       union side_bool_value value;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       switch (bool_size_bytes) {
-       case 1:
-       case 2:
-       case 4:
-       case 8:
-               break;
-       default:
-               abort();
-       }
-       ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_bool.offset);
-       memcpy(&value, ptr, bool_size_bytes);
-       tracer_print_type_bool(":", &type_gather->u.side_bool.type, &value,
-                       type_gather->u.side_bool.offset_bits);
-       return tracer_gather_size(access_mode, bool_size_bytes);
+       print_attributes("attr", ":", side_ptr_get(side_variant->attr), side_variant->nr_attr);
+       printf("%s", side_variant->nr_attr ? ", " : "");
+       printf("type: variant { options: {");
+       push_nesting(ctx);
 }
 
 static
-uint32_t tracer_print_gather_byte_type(const struct side_type_gather *type_gather, const void *_ptr)
+void after_print_description_variant(const struct side_type_variant *side_variant __attribute__((unused)), void *priv)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_byte.access_mode;
-       const char *ptr = (const char *) _ptr;
-       uint8_t value;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_byte.offset);
-       memcpy(&value, ptr, 1);
-       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);
+       pop_nesting(ctx);
+       printf(" } }");
 }
 
 static
-uint32_t tracer_print_gather_integer_type(const struct side_type_gather *type_gather, const void *_ptr,
-               enum tracer_display_base default_base)
+void before_print_description_array(const struct side_type_array *side_array, void *priv)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_integer.access_mode;
-       uint32_t integer_size_bytes = type_gather->u.side_integer.type.integer_size;
-       const char *ptr = (const char *) _ptr;
-       union side_integer_value value;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       switch (integer_size_bytes) {
-       case 1:
-       case 2:
-       case 4:
-       case 8:
-       case 16:
-               break;
-       default:
-               abort();
-       }
-       ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_integer.offset);
-       memcpy(&value, ptr, integer_size_bytes);
-       tracer_print_type_integer(":", &type_gather->u.side_integer.type, &value,
-                       type_gather->u.side_integer.offset_bits, default_base);
-       return tracer_gather_size(access_mode, integer_size_bytes);
+       print_attributes("attr", ":", side_ptr_get(side_array->attr), side_array->nr_attr);
+       printf("%s", side_array->nr_attr ? ", " : "");
+       printf("type: array { length: %" PRIu32 ", element:", side_array->length);
+       push_nesting(ctx);
 }
 
+
 static
-uint32_t tracer_print_gather_float_type(const struct side_type_gather *type_gather, const void *_ptr)
+void after_print_description_array(const struct side_type_array *side_array __attribute__((unused)), void *priv)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_float.access_mode;
-       uint32_t float_size_bytes = type_gather->u.side_float.type.float_size;
-       const char *ptr = (const char *) _ptr;
-       union side_float_value value;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       switch (float_size_bytes) {
-       case 2:
-       case 4:
-       case 8:
-       case 16:
-               break;
-       default:
-               abort();
-       }
-       ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_float.offset);
-       memcpy(&value, ptr, float_size_bytes);
-       tracer_print_type_float(":", &type_gather->u.side_float.type, &value);
-       return tracer_gather_size(access_mode, float_size_bytes);
+       pop_nesting(ctx);
+       printf(" }");
 }
 
 static
-uint32_t tracer_print_gather_string_type(const struct side_type_gather *type_gather, const void *_ptr)
+void before_print_description_vla(const struct side_type_vla *side_vla, void *priv)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_string.access_mode;
-       const char *ptr = (const char *) _ptr;
-       size_t string_len;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_string.offset);
-       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,
-                               side_enum_get(type_gather->u.side_string.type.byte_order), &string_len);
-       } else {
-               printf("<NULL>");
-               string_len = type_gather->u.side_string.type.unit_size;
-       }
-       return tracer_gather_size(access_mode, string_len);
+       print_attributes("attr", ":", side_ptr_get(side_vla->attr), side_vla->nr_attr);
+       printf("%s", side_vla->nr_attr ? ", " : "");
+       printf("type: vla { length:");
+       push_nesting(ctx);
 }
 
 static
-uint32_t tracer_print_gather_type(const struct side_type *type_desc, const void *ptr)
+void after_length_print_description_vla(const struct side_type_vla *side_vla __attribute__((unused)), void *priv)
 {
-       uint32_t len;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       printf("{ ");
-       switch (side_enum_get(type_desc->type)) {
-               /* Gather basic types */
-       case SIDE_TYPE_GATHER_BOOL:
-               len = tracer_print_gather_bool_type(&type_desc->u.side_gather, ptr);
-               break;
-       case SIDE_TYPE_GATHER_INTEGER:
-               len = tracer_print_gather_integer_type(&type_desc->u.side_gather, ptr,
-                               TRACER_DISPLAY_BASE_10);
-               break;
-       case SIDE_TYPE_GATHER_BYTE:
-               len = tracer_print_gather_byte_type(&type_desc->u.side_gather, ptr);
-               break;
-       case SIDE_TYPE_GATHER_POINTER:
-               len = tracer_print_gather_integer_type(&type_desc->u.side_gather, ptr,
-                               TRACER_DISPLAY_BASE_16);
-               break;
-       case SIDE_TYPE_GATHER_FLOAT:
-               len = tracer_print_gather_float_type(&type_desc->u.side_gather, ptr);
-               break;
-       case SIDE_TYPE_GATHER_STRING:
-               len = tracer_print_gather_string_type(&type_desc->u.side_gather, ptr);
-               break;
+       pop_nesting(ctx);
+       printf(", element:");
+       push_nesting(ctx);
+}
 
-               /* Gather enum types */
-       case SIDE_TYPE_GATHER_ENUM:
-               len = tracer_print_gather_enum_type(&type_desc->u.side_gather, ptr);
-               break;
+static
+void after_element_print_description_vla(const struct side_type_vla *side_vla __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-               /* Gather compound types */
-       case SIDE_TYPE_GATHER_STRUCT:
-               len = tracer_print_gather_struct(&type_desc->u.side_gather, ptr);
-               break;
-       case SIDE_TYPE_GATHER_ARRAY:
-               len = tracer_print_gather_array(&type_desc->u.side_gather, ptr);
-               break;
-       case SIDE_TYPE_GATHER_VLA:
-               len = tracer_print_gather_vla(&type_desc->u.side_gather, ptr, ptr);
-               break;
-       default:
-               fprintf(stderr, "<UNKNOWN GATHER TYPE>");
-               abort();
-       }
+       pop_nesting(ctx);
        printf(" }");
-       return len;
 }
 
 static
-uint32_t tracer_print_gather_enum_type(const struct side_type_gather *type_gather, const void *_ptr)
+void before_print_description_vla_visitor(const struct side_type_vla_visitor *side_vla_visitor, void *priv)
 {
-       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;
-       uint32_t integer_size_bytes = side_integer->type.integer_size;
-       const char *ptr = (const char *) _ptr;
-       union side_integer_value value;
-       union int_value v;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       switch (integer_size_bytes) {
-       case 1:
-       case 2:
-       case 4:
-       case 8:
-       case 16:
-               break;
-       default:
-               abort();
-       }
-       ptr = tracer_gather_access(access_mode, ptr + side_integer->offset);
-       memcpy(&value, ptr, integer_size_bytes);
-       v = tracer_load_gather_integer_value(side_integer, &value);
-       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, v);
-       return tracer_gather_size(access_mode, integer_size_bytes);
+       print_attributes("attr", ":", side_ptr_get(side_vla_visitor->attr), side_vla_visitor->nr_attr);
+       printf("%s", side_vla_visitor->nr_attr ? ", " : "");
+       printf("type: vla_visitor { length:");
+       push_nesting(ctx);
 }
 
 static
-void tracer_print_gather_field(const struct side_event_field *field, const void *ptr)
+void after_length_print_description_vla_visitor(const struct side_type_vla_visitor *side_vla_visitor __attribute__((unused)), void *priv)
 {
-       printf("%s: ", side_ptr_get(field->field_name));
-       (void) tracer_print_gather_type(&field->side_type, ptr);
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       pop_nesting(ctx);
+       printf(", element:");
+       push_nesting(ctx);
 }
 
 static
-uint32_t tracer_print_gather_struct(const struct side_type_gather *type_gather, const void *_ptr)
+void after_element_print_description_vla_visitor(const struct side_type_vla_visitor *side_vla_visitor __attribute__((unused)), void *priv)
 {
-       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;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_struct.offset);
-       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_struct->nr_fields; i++) {
-               printf("%s", i ? ", " : "");
-               tracer_print_gather_field(&side_ptr_get(side_struct->fields)[i], ptr);
-       }
+       pop_nesting(ctx);
        printf(" }");
-       return tracer_gather_size(access_mode, type_gather->u.side_struct.size);
 }
 
 static
-uint32_t tracer_print_gather_array(const struct side_type_gather *type_gather, const void *_ptr)
+void do_before_print_description_enum(const char *type_name, const struct side_enum_mappings *mappings, void *priv __attribute__((unused)))
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_array.access_mode;
-       const char *ptr = (const char *) _ptr, *orig_ptr;
-       uint32_t i;
+       uint32_t i, print_count = 0;
+
+       tracer_print_type_header("type", ":", side_ptr_get(mappings->attr), mappings->nr_attr);
+       printf("%s { labels: { ", type_name);
+       for (i = 0; i < mappings->nr_mappings; i++) {
+               const struct side_enum_mapping *mapping = &side_ptr_get(mappings->mappings)[i];
 
-       ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_array.offset);
-       orig_ptr = ptr;
-       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++) {
-               const struct side_type *elem_type = side_ptr_get(type_gather->u.side_array.type.elem_type);
-
-               switch (side_enum_get(elem_type->type)) {
-               case SIDE_TYPE_GATHER_VLA:
-                       fprintf(stderr, "<gather VLA only supported within gather structures>\n");
+               if (mapping->range_end < mapping->range_begin) {
+                       fprintf(stderr, "ERROR: Unexpected enum range: %" PRIu64 "-%" PRIu64 "\n",
+                               mapping->range_begin, mapping->range_end);
                        abort();
-               default:
-                       break;
                }
-               printf("%s", i ? ", " : "");
-               ptr += tracer_print_gather_type(elem_type, ptr);
+               printf("%s", print_count++ ? ", " : "");
+               if (mapping->range_begin == mapping->range_end)
+                       printf("[ %" PRIu64 " ]: ", mapping->range_begin);
+               else
+                       printf("[ %" PRIu64 " - %" PRIu64 " ]: ",
+                               mapping->range_begin, mapping->range_end);
+               tracer_print_type_string(side_ptr_get(mapping->label.p), mapping->label.unit_size,
+                       side_enum_get(mapping->label.byte_order), NULL);
        }
-       printf(" ]");
-       return tracer_gather_size(access_mode, ptr - orig_ptr);
+       if (!print_count)
+               printf("<NO LABEL>");
+
+       printf(" }, element: { ");
 }
 
+
 static
-uint32_t tracer_print_gather_vla(const struct side_type_gather *type_gather, const void *_ptr,
-               const void *_length_ptr)
+void do_after_print_description_enum(const char *type_name __attribute__((unused)), const struct side_enum_mappings *mappings __attribute__((unused)), void *priv __attribute__((unused)))
 {
-       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 int_value v = {};
-       uint32_t i, length;
+       printf(" }");
+}
 
-       /* Access length */
-       switch (side_enum_get(length_type->type)) {
-       case SIDE_TYPE_GATHER_INTEGER:
+static
+void before_print_description_enum(const struct side_type *type_desc, void *priv)
+{
+       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);
+
+       switch (side_enum_get(elem_type->type)) {
+       case SIDE_TYPE_U8:
+       case SIDE_TYPE_U16:
+       case SIDE_TYPE_U32:
+       case SIDE_TYPE_U64:
+       case SIDE_TYPE_U128:
+       case SIDE_TYPE_S8:
+       case SIDE_TYPE_S16:
+       case SIDE_TYPE_S32:
+       case SIDE_TYPE_S64:
+       case SIDE_TYPE_S128:
                break;
        default:
-               fprintf(stderr, "<gather VLA expects integer gather length type>\n");
+               fprintf(stderr, "Unsupported enum element type.\n");
                abort();
        }
-       v = tracer_load_gather_integer_value(&length_type->u.side_gather.u.side_integer,
-                                       length_ptr);
-       if (v.u[SIDE_INTEGER128_SPLIT_HIGH] || v.u[SIDE_INTEGER128_SPLIT_LOW] > UINT32_MAX) {
-               fprintf(stderr, "Unexpected vla length value\n");
-               abort();
-       }
-       length = (uint32_t) v.u[SIDE_INTEGER128_SPLIT_LOW];
-       ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_vla.offset);
-       orig_ptr = ptr;
-       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++) {
-               const struct side_type *elem_type = side_ptr_get(type_gather->u.side_vla.type.elem_type);
-
-               switch (side_enum_get(elem_type->type)) {
-               case SIDE_TYPE_GATHER_VLA:
-                       fprintf(stderr, "<gather VLA only supported within gather structures>\n");
-                       abort();
-               default:
-                       break;
-               }
-               printf("%s", i ? ", " : "");
-               ptr += tracer_print_gather_type(elem_type, ptr);
-       }
-       printf(" ]");
-       return tracer_gather_size(access_mode, ptr - orig_ptr);
+       do_before_print_description_enum("enum", mappings, priv);
 }
 
-struct tracer_visitor_priv {
-       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 *elem)
+void after_print_description_enum(const struct side_type *type_desc, void *priv)
 {
-       struct tracer_visitor_priv *tracer_priv = (struct tracer_visitor_priv *) tracer_ctx->priv;
+       const struct side_enum_mappings *mappings = side_ptr_get(type_desc->u.side_enum.mappings);
 
-       printf("%s", tracer_priv->i++ ? ", " : "");
-       tracer_print_type(tracer_priv->elem_type, elem, true);
-       return SIDE_VISITOR_STATUS_OK;
+       do_after_print_description_enum("enum", mappings, priv);
 }
 
 static
-void tracer_print_vla_visitor(const struct side_type *type_desc, struct side_arg_vla_visitor *vla_visitor)
+void before_print_description_enum_bitmap(const struct side_type *type_desc, void *priv __attribute__((unused)))
 {
-       void *app_ctx;
-       enum side_visitor_status status;
-       struct tracer_visitor_priv tracer_priv = {
-               .elem_type = side_ptr_get(type_desc->u.side_vla_visitor.elem_type),
-               .i = 0,
-       };
-       const struct side_tracer_visitor_ctx tracer_ctx = {
-               .write_elem = tracer_write_elem_cb,
-               .priv = &tracer_priv,
-       };
-       side_visitor_func func;
+       const struct side_type *elem_type = side_ptr_get(type_desc->u.side_enum_bitmap.elem_type);
+       const struct side_enum_bitmap_mappings *mappings = side_ptr_get(type_desc->u.side_enum_bitmap.mappings);
+       uint32_t i, print_count = 0;
 
-       if (!vla_visitor)
-               abort();
-       app_ctx = side_ptr_get(vla_visitor->app_ctx);
-       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("[ ");
-       func = side_ptr_get(type_desc->u.side_vla_visitor.visitor);
-       status = func(&tracer_ctx, app_ctx);
-       switch (status) {
-       case SIDE_VISITOR_STATUS_OK:
+       switch (side_enum_get(elem_type->type)) {
+       case SIDE_TYPE_BYTE:
+       case SIDE_TYPE_U8:
+       case SIDE_TYPE_U16:
+       case SIDE_TYPE_U32:
+       case SIDE_TYPE_U64:
+       case SIDE_TYPE_U128:
+       case SIDE_TYPE_ARRAY:
+       case SIDE_TYPE_VLA:
                break;
-       case SIDE_VISITOR_STATUS_ERROR:
-               fprintf(stderr, "ERROR: Visitor error\n");
+       default:
+               fprintf(stderr, "Unsupported enum element type.\n");
                abort();
        }
-       printf(" ]");
+       tracer_print_type_header("type", ":", side_ptr_get(mappings->attr), mappings->nr_attr);
+       printf("enum_bitmap { labels: { ");
+       for (i = 0; i < mappings->nr_mappings; i++) {
+               const struct side_enum_bitmap_mapping *mapping = &side_ptr_get(mappings->mappings)[i];
+
+               if (mapping->range_end < mapping->range_begin) {
+                       fprintf(stderr, "ERROR: Unexpected enum range: %" PRIu64 "-%" PRIu64 "\n",
+                               mapping->range_begin, mapping->range_end);
+                       abort();
+               }
+               printf("%s", print_count++ ? ", " : "");
+               if (mapping->range_begin == mapping->range_end)
+                       printf("[ %" PRIu64 " ]: ", mapping->range_begin);
+               else
+                       printf("[ %" PRIu64 " - %" PRIu64 " ]: ",
+                               mapping->range_begin, mapping->range_end);
+               tracer_print_type_string(side_ptr_get(mapping->label.p), mapping->label.unit_size,
+                       side_enum_get(mapping->label.byte_order), NULL);
+       }
+       if (!print_count)
+               printf("<NO LABEL>");
+
+       printf(" }, element: { ");
 }
 
 static
-void tracer_print_dynamic_struct(const struct side_arg_dynamic_struct *dynamic_struct)
+void after_print_description_enum_bitmap(const struct side_type *type_desc __attribute__((unused)), void *priv __attribute__((unused)))
 {
-       const struct side_arg_dynamic_field *fields = side_ptr_get(dynamic_struct->fields);
-       uint32_t i, len = dynamic_struct->len;
+       printf(" }");
+}
 
-       print_attributes("attr", "::", side_ptr_get(dynamic_struct->attr), dynamic_struct->nr_attr);
-       printf("%s", dynamic_struct->nr_attr ? ", " : "");
-       printf("fields:: ");
-       printf("{ ");
-       for (i = 0; i < len; i++) {
-               printf("%s", i ? ", " : "");
-               printf("%s:: ", side_ptr_get(fields[i].field_name));
-               tracer_print_dynamic(&fields[i].elem, true);
-       }
+static
+void print_description_gather_bool(const struct side_type_gather_bool *type,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("type", ":", side_ptr_get(type->type.attr),
+               type->type.nr_attr);
+       printf("gather_bool { size: %" PRIu16, type->type.bool_size);
+       if (type->type.len_bits)
+               printf(", len_bits: %" PRIu16, type->type.len_bits);
+       printf(", offset: %" PRIu64 ", offset_bits: %" PRIu16 ", access_mode: %s",
+               type->offset, type->offset_bits,
+               side_enum_get(type->access_mode) == SIDE_TYPE_GATHER_ACCESS_DIRECT ? "\"direct\"" : "\"pointer\"");
        printf(" }");
 }
 
-struct tracer_dynamic_struct_visitor_priv {
-       int i;
-};
+static
+void print_description_gather_byte(const struct side_type_gather_byte *type,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("type", ":", side_ptr_get(type->type.attr),
+               type->type.nr_attr);
+       printf("gather_byte { offset: %" PRIu64 ", access_mode: %s }",
+               type->offset,
+               side_enum_get(type->access_mode) == SIDE_TYPE_GATHER_ACCESS_DIRECT ? "\"direct\"" : "\"pointer\"");
+}
 
 static
-enum side_visitor_status tracer_dynamic_struct_write_elem_cb(
-                       const struct side_tracer_dynamic_struct_visitor_ctx *tracer_ctx,
-                       const struct side_arg_dynamic_field *dynamic_field)
+void print_description_gather_integer(const struct side_type_gather_integer *type,
+               void *priv __attribute__((unused)))
 {
-       struct tracer_dynamic_struct_visitor_priv *tracer_priv =
-               (struct tracer_dynamic_struct_visitor_priv *) tracer_ctx->priv;
+       tracer_print_type_header("type", ":", side_ptr_get(type->type.attr),
+               type->type.nr_attr);
+       printf("gather_integer { size: %" PRIu16 ", signedness: %s, byte_order: \"%s\"",
+               type->type.integer_size,
+               type->type.signedness ? "true" : "false",
+               side_enum_get(type->type.byte_order) == SIDE_TYPE_BYTE_ORDER_LE ? "le" : "be");
+       if (type->type.len_bits)
+               printf(", len_bits: %" PRIu16, type->type.len_bits);
+       printf(", offset: %" PRIu64 ", offset_bits: %" PRIu16 ", access_mode: %s",
+               type->offset, type->offset_bits,
+               side_enum_get(type->access_mode) == SIDE_TYPE_GATHER_ACCESS_DIRECT ? "\"direct\"" : "\"pointer\"");
+       printf(" }");
+}
 
-       printf("%s", tracer_priv->i++ ? ", " : "");
-       printf("%s:: ", side_ptr_get(dynamic_field->field_name));
-       tracer_print_dynamic(&dynamic_field->elem, true);
-       return SIDE_VISITOR_STATUS_OK;
+static
+void print_description_gather_pointer(const struct side_type_gather_integer *type,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("type", ":", side_ptr_get(type->type.attr),
+               type->type.nr_attr);
+       printf("gather_pointer { size: %" PRIu16 ", signedness: %s, byte_order: \"%s\"",
+               type->type.integer_size,
+               type->type.signedness ? "true" : "false",
+               side_enum_get(type->type.byte_order) == SIDE_TYPE_BYTE_ORDER_LE ? "le" : "be");
+       if (type->type.len_bits)
+               printf(", len_bits: %" PRIu16, type->type.len_bits);
+       printf(", offset: %" PRIu64 ", offset_bits: %" PRIu16 ", access_mode: %s",
+               type->offset, type->offset_bits,
+               side_enum_get(type->access_mode) == SIDE_TYPE_GATHER_ACCESS_DIRECT ? "\"direct\"" : "\"pointer\"");
+       printf(" }");
 }
 
 static
-void tracer_print_dynamic_struct_visitor(const struct side_arg *item)
+void print_description_gather_float(const struct side_type_gather_float *type,
+               void *priv __attribute__((unused)))
 {
-       struct side_arg_dynamic_struct_visitor *dynamic_struct_visitor;
-       struct tracer_dynamic_struct_visitor_priv tracer_priv = {
-               .i = 0,
-       };
-       const struct side_tracer_dynamic_struct_visitor_ctx tracer_ctx = {
-               .write_field = tracer_dynamic_struct_write_elem_cb,
-               .priv = &tracer_priv,
-       };
-       enum side_visitor_status status;
-       void *app_ctx;
+       tracer_print_type_header("type", ":", side_ptr_get(type->type.attr),
+               type->type.nr_attr);
+       printf("gather_float { size: %" PRIu16 ", byte_order: \"%s\"",
+               type->type.float_size,
+               side_enum_get(type->type.byte_order) == SIDE_TYPE_BYTE_ORDER_LE ? "le" : "be");
+       printf(", offset: %" PRIu64 ", access_mode: %s",
+               type->offset,
+               side_enum_get(type->access_mode) == SIDE_TYPE_GATHER_ACCESS_DIRECT ? "\"direct\"" : "\"pointer\"");
+       printf(" }");
+}
 
-       dynamic_struct_visitor = side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor);
-       if (!dynamic_struct_visitor)
-               abort();
-       app_ctx = side_ptr_get(dynamic_struct_visitor->app_ctx);
-       print_attributes("attr", "::", side_ptr_get(dynamic_struct_visitor->attr), dynamic_struct_visitor->nr_attr);
-       printf("%s", dynamic_struct_visitor->nr_attr ? ", " : "");
-       printf("fields:: ");
-       printf("{ ");
-       status = side_ptr_get(dynamic_struct_visitor->visitor)(&tracer_ctx, app_ctx);
-       switch (status) {
-       case SIDE_VISITOR_STATUS_OK:
-               break;
-       case SIDE_VISITOR_STATUS_ERROR:
-               fprintf(stderr, "ERROR: Visitor error\n");
-               abort();
-       }
+static
+void print_description_gather_string(const struct side_type_gather_string *type,
+               void *priv __attribute__((unused)))
+{
+       tracer_print_type_header("type", ":", side_ptr_get(type->type.attr),
+               type->type.nr_attr);
+       printf("gather_string { unit_size: %" PRIu8,
+               type->type.unit_size);
+       if (type->type.unit_size > 1)
+               printf(", byte_order: \"%s\"",
+                       side_enum_get(type->type.byte_order) == SIDE_TYPE_BYTE_ORDER_LE ? "le" : "be");
+       printf(", offset: %" PRIu64 ", access_mode: %s",
+               type->offset,
+               side_enum_get(type->access_mode) == SIDE_TYPE_GATHER_ACCESS_DIRECT ? "\"direct\"" : "\"pointer\"");
        printf(" }");
 }
 
 static
-void tracer_print_dynamic_vla(const struct side_arg_dynamic_vla *vla)
+void before_print_description_gather_struct(const struct side_type_gather_struct *side_gather_struct, void *priv)
 {
-       const struct side_arg *sav = side_ptr_get(vla->sav);
-       uint32_t i, side_sav_len = vla->len;
+       const struct side_type_struct *side_struct = side_ptr_get(side_gather_struct->type);
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       print_attributes("attr", "::", side_ptr_get(vla->attr), vla->nr_attr);
-       printf("%s", vla->nr_attr ? ", " : "");
-       printf("elements:: ");
-       printf("[ ");
-       for (i = 0; i < side_sav_len; i++) {
-               printf("%s", i ? ", " : "");
-               tracer_print_dynamic(&sav[i], true);
-       }
-       printf(" ]");
+       print_attributes("attr", ":", side_ptr_get(side_struct->attr), side_struct->nr_attr);
+       printf("%s", side_struct->nr_attr ? ", " : "");
+       printf("type: gather_struct { size: %" PRIu32 ", offset: %" PRIu64 ", access_mode: %s, fields: {",
+               side_gather_struct->size, side_gather_struct->offset,
+               side_enum_get(side_gather_struct->access_mode) == SIDE_TYPE_GATHER_ACCESS_DIRECT ? "\"direct\"" : "\"pointer\"");
+       push_nesting(ctx);
 }
 
-struct tracer_dynamic_vla_visitor_priv {
-       int i;
-};
+static
+void after_print_description_gather_struct(const struct side_type_gather_struct *side_gather_struct __attribute__((unused)), void *priv)
+{
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       pop_nesting(ctx);
+       printf(" } }");
+}
+
+static
+void before_print_description_gather_array(const struct side_type_gather_array *side_gather_array, void *priv)
+{
+       const struct side_type_array *side_array = &side_gather_array->type;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       print_attributes("attr", ":", side_ptr_get(side_array->attr), side_array->nr_attr);
+       printf("%s", side_array->nr_attr ? ", " : "");
+       printf("type: gather_array { offset: %" PRIu64 ", access_mode: %s, element:",
+               side_gather_array->offset,
+               side_enum_get(side_gather_array->access_mode) == SIDE_TYPE_GATHER_ACCESS_DIRECT ? "\"direct\"" : "\"pointer\"");
+       push_nesting(ctx);
+}
 
 static
-enum side_visitor_status tracer_dynamic_vla_write_elem_cb(
-                       const struct side_tracer_visitor_ctx *tracer_ctx,
-                       const struct side_arg *elem)
+void after_print_description_gather_array(const struct side_type_gather_array *side_gather_array __attribute__((unused)), void *priv)
 {
-       struct tracer_dynamic_vla_visitor_priv *tracer_priv =
-               (struct tracer_dynamic_vla_visitor_priv *) tracer_ctx->priv;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       pop_nesting(ctx);
+       printf(" }");
+}
 
-       printf("%s", tracer_priv->i++ ? ", " : "");
-       tracer_print_dynamic(elem, true);
-       return SIDE_VISITOR_STATUS_OK;
+static
+void before_print_description_gather_vla(const struct side_type_gather_vla *side_gather_vla, void *priv)
+{
+       const struct side_type_vla *side_vla = &side_gather_vla->type;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
+
+       print_attributes("attr", ":", side_ptr_get(side_vla->attr), side_vla->nr_attr);
+       printf("%s", side_vla->nr_attr ? ", " : "");
+       printf("type: gather_vla { offset: %" PRIu64 ", access_mode: %s, length:",
+               side_gather_vla->offset,
+               side_enum_get(side_gather_vla->access_mode) == SIDE_TYPE_GATHER_ACCESS_DIRECT ? "\"direct\"" : "\"pointer\"");
+       push_nesting(ctx);
 }
 
 static
-void tracer_print_dynamic_vla_visitor(const struct side_arg *item)
+void after_length_print_description_gather_vla(const struct side_type_gather_vla *side_gather_vla __attribute__((unused)), void *priv)
 {
-       struct side_arg_dynamic_vla_visitor *dynamic_vla_visitor;
-       struct tracer_dynamic_vla_visitor_priv tracer_priv = {
-               .i = 0,
-       };
-       const struct side_tracer_visitor_ctx tracer_ctx = {
-               .write_elem = tracer_dynamic_vla_write_elem_cb,
-               .priv = &tracer_priv,
-       };
-       enum side_visitor_status status;
-       void *app_ctx;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-       dynamic_vla_visitor = side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor);
-       if (!dynamic_vla_visitor)
-               abort();
-       app_ctx = side_ptr_get(dynamic_vla_visitor->app_ctx);
-       print_attributes("attr", "::", side_ptr_get(dynamic_vla_visitor->attr), dynamic_vla_visitor->nr_attr);
-       printf("%s", dynamic_vla_visitor->nr_attr ? ", " : "");
-       printf("elements:: ");
-       printf("[ ");
-       status = side_ptr_get(dynamic_vla_visitor->visitor)(&tracer_ctx, app_ctx);
-       switch (status) {
-       case SIDE_VISITOR_STATUS_OK:
-               break;
-       case SIDE_VISITOR_STATUS_ERROR:
-               fprintf(stderr, "ERROR: Visitor error\n");
-               abort();
-       }
-       printf(" ]");
+       pop_nesting(ctx);
+       printf(", element:");
+       push_nesting(ctx);
 }
 
 static
-void tracer_print_dynamic(const struct side_arg *item, bool print_brackets)
+void after_element_print_description_gather_vla(const struct side_type_gather_vla *side_gather_vla __attribute__((unused)), void *priv)
 {
-       if (print_brackets)
-               printf("{ ");
-       switch (side_enum_get(item->type)) {
-               /* Dynamic basic types */
-       case SIDE_TYPE_DYNAMIC_NULL:
-               tracer_print_type_header("::", side_ptr_get(item->u.side_dynamic.side_null.attr),
-                       item->u.side_dynamic.side_null.nr_attr);
-               printf("<NULL TYPE>");
-               break;
-       case SIDE_TYPE_DYNAMIC_BOOL:
-               tracer_print_type_bool("::", &item->u.side_dynamic.side_bool.type, &item->u.side_dynamic.side_bool.value, 0);
-               break;
-       case SIDE_TYPE_DYNAMIC_INTEGER:
-               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_TYPE_DYNAMIC_BYTE:
-               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:
-               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_TYPE_DYNAMIC_FLOAT:
-               tracer_print_type_float("::", &item->u.side_dynamic.side_float.type,
-                                       &item->u.side_dynamic.side_float.value);
-               break;
-       case SIDE_TYPE_DYNAMIC_STRING:
-               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,
-                               side_enum_get(item->u.side_dynamic.side_string.type.byte_order), NULL);
-               break;
+       struct print_ctx *ctx = (struct print_ctx *) priv;
 
-               /* Dynamic compound types */
-       case SIDE_TYPE_DYNAMIC_STRUCT:
-               tracer_print_dynamic_struct(side_ptr_get(item->u.side_dynamic.side_dynamic_struct));
-               break;
-       case SIDE_TYPE_DYNAMIC_STRUCT_VISITOR:
-               tracer_print_dynamic_struct_visitor(item);
-               break;
-       case SIDE_TYPE_DYNAMIC_VLA:
-               tracer_print_dynamic_vla(side_ptr_get(item->u.side_dynamic.side_dynamic_vla));
-               break;
-       case SIDE_TYPE_DYNAMIC_VLA_VISITOR:
-               tracer_print_dynamic_vla_visitor(item);
-               break;
-       default:
-               fprintf(stderr, "<UNKNOWN TYPE>\n");
-               abort();
-       }
-       if (print_brackets)
-               printf(" }");
+       pop_nesting(ctx);
+       printf(" }");
 }
 
 static
-void tracer_print_static_fields(const struct side_event_description *desc,
-               const struct side_arg_vec *side_arg_vec,
-               uint32_t *nr_items, void *caller_addr)
+void before_print_description_gather_enum(const struct side_type_gather_enum *type, void *priv)
 {
-       const struct side_arg *sav = side_ptr_get(side_arg_vec->sav);
-       uint32_t i, side_sav_len = side_arg_vec->len;
+       const struct side_enum_mappings *mappings = side_ptr_get(type->mappings);
+       const struct side_type *elem_type = side_ptr_get(type->elem_type);
 
-       if (print_caller)
-               printf("caller: [%p], ", caller_addr);
-       printf("provider: %s, event: %s",
-               side_ptr_get(desc->provider_name),
-               side_ptr_get(desc->event_name));
-       if (desc->nr_fields != side_sav_len) {
-               fprintf(stderr, "ERROR: number of fields mismatch between description and arguments\n");
+       if (side_enum_get(elem_type->type) != SIDE_TYPE_GATHER_INTEGER) {
+               fprintf(stderr, "Unsupported enum element type.\n");
                abort();
        }
-       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 ? ", " : "");
-               tracer_print_field(&side_ptr_get(desc->fields)[i], &sav[i]);
-       }
-       if (nr_items)
-               *nr_items = i;
-       if (side_sav_len)
-               printf(" }");
+       do_before_print_description_enum("gather_enum", mappings, priv);
 }
 
 static
-void tracer_call(const struct side_event_description *desc,
-               const struct side_arg_vec *side_arg_vec,
-               void *priv __attribute__((unused)),
-               void *caller_addr)
+void after_print_description_gather_enum(const struct side_type_gather_enum *type, void *priv)
 {
-       uint32_t nr_fields = 0;
+       const struct side_enum_mappings *mappings = side_ptr_get(type->mappings);
 
-       tracer_print_static_fields(desc, side_arg_vec, &nr_fields, caller_addr);
-       printf("\n");
+       do_after_print_description_enum("gather_enum", mappings, priv);
 }
 
 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,
-               void *priv __attribute__((unused)),
-               void *caller_addr)
+void print_description_dynamic(const struct side_type *type_desc __attribute__((unused)), void *priv __attribute__((unused)))
 {
-       uint32_t nr_fields = 0, i, var_struct_len = var_struct->len;
+       printf("type: dynamic");
+}
 
-       tracer_print_static_fields(desc, side_arg_vec, &nr_fields, caller_addr);
+static
+struct side_description_visitor description_visitor = {
+       .before_event_func = before_print_description_event,
+       .after_event_func = after_print_description_event,
+       .before_static_fields_func = before_print_description_static_fields,
+       .after_static_fields_func = after_print_description_static_fields,
+
+       /* Stack-copy basic types. */
+       .before_field_func = before_print_description_field,
+       .after_field_func = after_print_description_field,
+       .before_elem_func = before_print_description_elem,
+       .after_elem_func = after_print_description_elem,
+       .before_option_func = before_print_description_option,
+       .after_option_func = after_print_description_option,
+       .null_type_func = print_description_null,
+       .bool_type_func = print_description_bool,
+       .integer_type_func = print_description_integer,
+       .byte_type_func = print_description_byte,
+       .pointer_type_func = print_description_pointer,
+       .float_type_func = print_description_float,
+       .string_type_func = print_description_string,
+
+       /* Stack-copy compound types. */
+       .before_struct_type_func = before_print_description_struct,
+       .after_struct_type_func = after_print_description_struct,
+       .before_variant_type_func = before_print_description_variant,
+       .after_variant_type_func = after_print_description_variant,
+       .before_array_type_func = before_print_description_array,
+       .after_array_type_func = after_print_description_array,
+       .before_vla_type_func = before_print_description_vla,
+       .after_length_vla_type_func = after_length_print_description_vla,
+       .after_element_vla_type_func = after_element_print_description_vla,
+       .before_vla_visitor_type_func = before_print_description_vla_visitor,
+       .after_length_vla_visitor_type_func = after_length_print_description_vla_visitor,
+       .after_element_vla_visitor_type_func = after_element_print_description_vla_visitor,
+
+       /* Stack-copy enumeration types. */
+       .before_enum_type_func = before_print_description_enum,
+       .after_enum_type_func = after_print_description_enum,
+       .before_enum_bitmap_type_func = before_print_description_enum_bitmap,
+       .after_enum_bitmap_type_func = after_print_description_enum_bitmap,
+
+       /* Gather basic types. */
+       .gather_bool_type_func = print_description_gather_bool,
+       .gather_byte_type_func = print_description_gather_byte,
+       .gather_integer_type_func = print_description_gather_integer,
+       .gather_pointer_type_func = print_description_gather_pointer,
+       .gather_float_type_func = print_description_gather_float,
+       .gather_string_type_func = print_description_gather_string,
+
+       /* Gather compound types. */
+       .before_gather_struct_type_func = before_print_description_gather_struct,
+       .after_gather_struct_type_func = after_print_description_gather_struct,
+       .before_gather_array_type_func = before_print_description_gather_array,
+       .after_gather_array_type_func = after_print_description_gather_array,
+       .before_gather_vla_type_func = before_print_description_gather_vla,
+       .after_length_gather_vla_type_func = after_length_print_description_gather_vla,
+       .after_element_gather_vla_type_func = after_element_print_description_gather_vla,
+
+       /* Gather enumeration types. */
+       .before_gather_enum_type_func = before_print_description_gather_enum,
+       .after_gather_enum_type_func = after_print_description_gather_enum,
+
+       /* Dynamic types. */
+       .dynamic_type_func = print_description_dynamic,
+};
 
-       if (side_unlikely(!(desc->flags & SIDE_EVENT_FLAG_VARIADIC))) {
-               fprintf(stderr, "ERROR: unexpected non-variadic event description\n");
-               abort();
-       }
-       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 ? ", " : "");
-               printf("%s:: ", side_ptr_get(side_ptr_get(var_struct->fields)[i].field_name));
-               tracer_print_dynamic(&side_ptr_get(var_struct->fields)[i].elem, true);
-       }
-       if (i)
-               printf(" }");
-       printf("\n");
+static
+void print_event_description(const struct side_event_description *desc)
+{
+       struct print_ctx ctx = {};
+
+       description_visitor_event(&description_visitor, desc, &ctx);
 }
 
 static
@@ -2136,6 +2574,7 @@ void tracer_event_notification(enum side_tracer_notification notif,
                                        side_ptr_get(event->provider_name), side_ptr_get(event->event_name),
                                        event->nr_side_attr_type - _NR_SIDE_ATTR_TYPE);
                        }
+                       print_event_description(event);
                        if (event->flags & SIDE_EVENT_FLAG_VARIADIC) {
                                ret = side_tracer_callback_variadic_register(event, tracer_call_variadic, NULL, tracer_key);
                                if (ret)
index 51fca8fedc16e5e18fcbbcde295fd2e7371670c0..b767e62848c9dafa893ace011a92acba3a9711a2 100644 (file)
@@ -223,21 +223,21 @@ size_t type_visitor_strlen(const void *p, uint8_t unit_size)
 static
 void side_visit_elem(const struct side_type_visitor *type_visitor, const struct side_type *type_desc, const struct side_arg *item, void *priv)
 {
-       if (type_visitor->elem_func)
-               type_visitor->elem_func(SIDE_TYPE_VISITOR_BEFORE, type_desc, priv);
+       if (type_visitor->before_elem_func)
+               type_visitor->before_elem_func(type_desc, priv);
        side_visit_type(type_visitor, type_desc, item, priv);
-       if (type_visitor->elem_func)
-               type_visitor->elem_func(SIDE_TYPE_VISITOR_AFTER, type_desc, priv);
+       if (type_visitor->after_elem_func)
+               type_visitor->after_elem_func(type_desc, priv);
 }
 
 static
 void side_visit_field(const struct side_type_visitor *type_visitor, const struct side_event_field *item_desc, const struct side_arg *item, void *priv)
 {
-       if (type_visitor->field_func)
-               type_visitor->field_func(SIDE_TYPE_VISITOR_BEFORE, item_desc, priv);
+       if (type_visitor->before_field_func)
+               type_visitor->before_field_func(item_desc, priv);
        side_visit_type(type_visitor, &item_desc->side_type, item, priv);
-       if (type_visitor->field_func)
-               type_visitor->field_func(SIDE_TYPE_VISITOR_AFTER, item_desc, priv);
+       if (type_visitor->after_field_func)
+               type_visitor->after_field_func(item_desc, priv);
 }
 
 static
@@ -251,12 +251,12 @@ void type_visitor_struct(const struct side_type_visitor *type_visitor, const str
                fprintf(stderr, "ERROR: number of fields mismatch between description and arguments of structure\n");
                abort();
        }
-       if (type_visitor->struct_type_func)
-               type_visitor->struct_type_func(SIDE_TYPE_VISITOR_BEFORE, side_struct, side_arg_vec, priv);
+       if (type_visitor->before_struct_type_func)
+               type_visitor->before_struct_type_func(side_struct, side_arg_vec, priv);
        for (i = 0; i < side_sav_len; i++)
                side_visit_field(type_visitor, &side_ptr_get(side_struct->fields)[i], &sav[i], priv);
-       if (type_visitor->struct_type_func)
-               type_visitor->struct_type_func(SIDE_TYPE_VISITOR_AFTER, side_struct, side_arg_vec, priv);
+       if (type_visitor->after_struct_type_func)
+               type_visitor->after_struct_type_func(side_struct, side_arg_vec, priv);
 }
 
 static
@@ -312,12 +312,12 @@ void type_visitor_array(const struct side_type_visitor *type_visitor, const stru
                fprintf(stderr, "ERROR: length mismatch between description and arguments of array\n");
                abort();
        }
-       if (type_visitor->array_type_func)
-               type_visitor->array_type_func(SIDE_TYPE_VISITOR_BEFORE, &type_desc->u.side_array, side_arg_vec, priv);
+       if (type_visitor->before_array_type_func)
+               type_visitor->before_array_type_func(&type_desc->u.side_array, side_arg_vec, priv);
        for (i = 0; i < side_sav_len; i++)
                side_visit_elem(type_visitor, side_ptr_get(type_desc->u.side_array.elem_type), &sav[i], priv);
-       if (type_visitor->array_type_func)
-               type_visitor->array_type_func(SIDE_TYPE_VISITOR_AFTER, &type_desc->u.side_array, side_arg_vec, priv);
+       if (type_visitor->after_array_type_func)
+               type_visitor->after_array_type_func(&type_desc->u.side_array, side_arg_vec, priv);
 }
 
 static
@@ -326,12 +326,12 @@ void type_visitor_vla(const struct side_type_visitor *type_visitor, const struct
        const struct side_arg *sav = side_ptr_get(side_arg_vec->sav);
        uint32_t i, side_sav_len = side_arg_vec->len;
 
-       if (type_visitor->vla_type_func)
-               type_visitor->vla_type_func(SIDE_TYPE_VISITOR_BEFORE, &type_desc->u.side_vla, side_arg_vec, priv);
+       if (type_visitor->before_vla_type_func)
+               type_visitor->before_vla_type_func(&type_desc->u.side_vla, side_arg_vec, priv);
        for (i = 0; i < side_sav_len; i++)
                side_visit_elem(type_visitor, side_ptr_get(type_desc->u.side_vla.elem_type), &sav[i], priv);
-       if (type_visitor->vla_type_func)
-               type_visitor->vla_type_func(SIDE_TYPE_VISITOR_AFTER, &type_desc->u.side_vla, side_arg_vec, priv);
+       if (type_visitor->after_vla_type_func)
+               type_visitor->after_vla_type_func(&type_desc->u.side_vla, side_arg_vec, priv);
 }
 
 struct tracer_visitor_priv {
@@ -357,7 +357,7 @@ void type_visitor_vla_visitor(const struct side_type_visitor *type_visitor, cons
        struct tracer_visitor_priv tracer_priv = {
                .type_visitor = type_visitor,
                .priv = priv,
-               .elem_type = side_ptr_get(type_desc->u.side_vla_visitor.elem_type),
+               .elem_type = side_ptr_get(side_ptr_get(type_desc->u.side_vla_visitor)->elem_type),
                .i = 0,
        };
        const struct side_tracer_visitor_ctx tracer_ctx = {
@@ -370,10 +370,10 @@ void type_visitor_vla_visitor(const struct side_type_visitor *type_visitor, cons
 
        if (!vla_visitor)
                abort();
-       if (type_visitor->vla_visitor_type_func)
-               type_visitor->vla_visitor_type_func(SIDE_TYPE_VISITOR_BEFORE, &type_desc->u.side_vla_visitor, vla_visitor, priv);
+       if (type_visitor->before_vla_visitor_type_func)
+               type_visitor->before_vla_visitor_type_func(side_ptr_get(type_desc->u.side_vla_visitor), vla_visitor, priv);
        app_ctx = side_ptr_get(vla_visitor->app_ctx);
-       func = side_ptr_get(type_desc->u.side_vla_visitor.visitor);
+       func = side_ptr_get(side_ptr_get(type_desc->u.side_vla_visitor)->visitor);
        status = func(&tracer_ctx, app_ctx);
        switch (status) {
        case SIDE_VISITOR_STATUS_OK:
@@ -382,8 +382,8 @@ void type_visitor_vla_visitor(const struct side_type_visitor *type_visitor, cons
                fprintf(stderr, "ERROR: Visitor error\n");
                abort();
        }
-       if (type_visitor->vla_visitor_type_func)
-               type_visitor->vla_visitor_type_func(SIDE_TYPE_VISITOR_AFTER, &type_desc->u.side_vla_visitor, vla_visitor, priv);
+       if (type_visitor->after_vla_visitor_type_func)
+               type_visitor->after_vla_visitor_type_func(side_ptr_get(type_desc->u.side_vla_visitor), vla_visitor, priv);
 }
 
 static
@@ -418,8 +418,7 @@ static
 union int_value tracer_load_gather_integer_value(const struct side_type_gather_integer *side_integer,
                const void *_ptr)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) side_integer->access_mode;
+       enum side_type_gather_access_mode access_mode = side_enum_get(side_integer->access_mode);
        uint32_t integer_size_bytes = side_integer->type.integer_size;
        const char *ptr = (const char *) _ptr;
        union side_integer_value value;
@@ -433,43 +432,41 @@ union int_value tracer_load_gather_integer_value(const struct side_type_gather_i
 static
 void visit_gather_field(const struct side_type_visitor *type_visitor, const struct side_event_field *field, const void *ptr, void *priv)
 {
-       if (type_visitor->field_func)
-               type_visitor->field_func(SIDE_TYPE_VISITOR_BEFORE, field, priv);
+       if (type_visitor->before_field_func)
+               type_visitor->before_field_func(field, priv);
        (void) visit_gather_type(type_visitor, &field->side_type, ptr, priv);
-       if (type_visitor->field_func)
-               type_visitor->field_func(SIDE_TYPE_VISITOR_AFTER, field, priv);
+       if (type_visitor->after_field_func)
+               type_visitor->after_field_func(field, priv);
 }
 
 static
 uint32_t type_visitor_gather_struct(const struct side_type_visitor *type_visitor, const struct side_type_gather *type_gather, const void *_ptr, void *priv)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_struct.access_mode;
+       enum side_type_gather_access_mode access_mode = side_enum_get(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;
 
-       if (type_visitor->gather_struct_type_func)
-               type_visitor->gather_struct_type_func(SIDE_TYPE_VISITOR_BEFORE, side_struct, priv);
+       if (type_visitor->before_gather_struct_type_func)
+               type_visitor->before_gather_struct_type_func(side_struct, priv);
        ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_struct.offset);
        for (i = 0; i < side_struct->nr_fields; i++)
                visit_gather_field(type_visitor, &side_ptr_get(side_struct->fields)[i], ptr, priv);
-       if (type_visitor->gather_struct_type_func)
-               type_visitor->gather_struct_type_func(SIDE_TYPE_VISITOR_AFTER, side_struct, priv);
+       if (type_visitor->after_gather_struct_type_func)
+               type_visitor->after_gather_struct_type_func(side_struct, priv);
        return tracer_gather_size(access_mode, type_gather->u.side_struct.size);
 }
 
 static
 uint32_t type_visitor_gather_array(const struct side_type_visitor *type_visitor, const struct side_type_gather *type_gather, const void *_ptr, void *priv)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_array.access_mode;
+       enum side_type_gather_access_mode access_mode = side_enum_get(type_gather->u.side_array.access_mode);
        const struct side_type_array *side_array = &type_gather->u.side_array.type;
        const char *ptr = (const char *) _ptr, *orig_ptr;
        uint32_t i;
 
-       if (type_visitor->gather_array_type_func)
-               type_visitor->gather_array_type_func(SIDE_TYPE_VISITOR_BEFORE, side_array, priv);
+       if (type_visitor->before_gather_array_type_func)
+               type_visitor->before_gather_array_type_func(side_array, priv);
        ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_array.offset);
        orig_ptr = ptr;
        for (i = 0; i < side_array->length; i++) {
@@ -484,18 +481,17 @@ uint32_t type_visitor_gather_array(const struct side_type_visitor *type_visitor,
                }
                ptr += visit_gather_elem(type_visitor, elem_type, ptr, priv);
        }
-       if (type_visitor->gather_array_type_func)
-               type_visitor->gather_array_type_func(SIDE_TYPE_VISITOR_AFTER, side_array, priv);
+       if (type_visitor->after_gather_array_type_func)
+               type_visitor->after_gather_array_type_func(side_array, priv);
        return tracer_gather_size(access_mode, ptr - orig_ptr);
 }
 
 static
 uint32_t type_visitor_gather_vla(const struct side_type_visitor *type_visitor, const struct side_type_gather *type_gather, const void *_ptr, const void *_length_ptr, void *priv)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_vla.access_mode;
+       enum side_type_gather_access_mode access_mode = side_enum_get(type_gather->u.side_vla.access_mode);
        const struct side_type_vla *side_vla = &type_gather->u.side_vla.type;
-       const struct side_type *length_type = side_ptr_get(type_gather->u.side_vla.length_type);
+       const struct side_type *length_type = side_ptr_get(type_gather->u.side_vla.type.length_type);
        const char *ptr = (const char *) _ptr, *orig_ptr;
        const char *length_ptr = (const char *) _length_ptr;
        union int_value v = {};
@@ -516,8 +512,8 @@ uint32_t type_visitor_gather_vla(const struct side_type_visitor *type_visitor, c
                abort();
        }
        length = (uint32_t) v.u[SIDE_INTEGER128_SPLIT_LOW];
-       if (type_visitor->gather_vla_type_func)
-               type_visitor->gather_vla_type_func(SIDE_TYPE_VISITOR_BEFORE, side_vla, length, priv);
+       if (type_visitor->before_gather_vla_type_func)
+               type_visitor->before_gather_vla_type_func(side_vla, length, priv);
        ptr = tracer_gather_access(access_mode, ptr + type_gather->u.side_vla.offset);
        orig_ptr = ptr;
        for (i = 0; i < length; i++) {
@@ -532,16 +528,15 @@ uint32_t type_visitor_gather_vla(const struct side_type_visitor *type_visitor, c
                }
                ptr += visit_gather_elem(type_visitor, elem_type, ptr, priv);
        }
-       if (type_visitor->gather_vla_type_func)
-               type_visitor->gather_vla_type_func(SIDE_TYPE_VISITOR_AFTER, side_vla, length, priv);
+       if (type_visitor->after_gather_vla_type_func)
+               type_visitor->after_gather_vla_type_func(side_vla, length, priv);
        return tracer_gather_size(access_mode, ptr - orig_ptr);
 }
 
 static
 uint32_t type_visitor_gather_bool(const struct side_type_visitor *type_visitor, const struct side_type_gather *type_gather, const void *_ptr, void *priv)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_bool.access_mode;
+       enum side_type_gather_access_mode access_mode = side_enum_get(type_gather->u.side_bool.access_mode);
        uint32_t bool_size_bytes = type_gather->u.side_bool.type.bool_size;
        const char *ptr = (const char *) _ptr;
        union side_bool_value value;
@@ -565,8 +560,7 @@ uint32_t type_visitor_gather_bool(const struct side_type_visitor *type_visitor,
 static
 uint32_t type_visitor_gather_byte(const struct side_type_visitor *type_visitor, const struct side_type_gather *type_gather, const void *_ptr, void *priv)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_byte.access_mode;
+       enum side_type_gather_access_mode access_mode = side_enum_get(type_gather->u.side_byte.access_mode);
        const char *ptr = (const char *) _ptr;
        uint8_t value;
 
@@ -581,8 +575,7 @@ static
 uint32_t type_visitor_gather_integer(const struct side_type_visitor *type_visitor, const struct side_type_gather *type_gather, const void *_ptr,
                enum side_type_label integer_type, void *priv)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_integer.access_mode;
+       enum side_type_gather_access_mode access_mode = side_enum_get(type_gather->u.side_integer.access_mode);
        uint32_t integer_size_bytes = type_gather->u.side_integer.type.integer_size;
        const char *ptr = (const char *) _ptr;
        union side_integer_value value;
@@ -618,8 +611,7 @@ uint32_t type_visitor_gather_integer(const struct side_type_visitor *type_visito
 static
 uint32_t type_visitor_gather_float(const struct side_type_visitor *type_visitor, const struct side_type_gather *type_gather, const void *_ptr, void *priv)
 {
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_float.access_mode;
+       enum side_type_gather_access_mode access_mode = side_enum_get(type_gather->u.side_float.access_mode);
        uint32_t float_size_bytes = type_gather->u.side_float.type.float_size;
        const char *ptr = (const char *) _ptr;
        union side_float_value value;
@@ -644,8 +636,7 @@ static
 uint32_t type_visitor_gather_string(const struct side_type_visitor *type_visitor, const struct side_type_gather *type_gather, const void *_ptr, void *priv)
 {
 
-       enum side_type_gather_access_mode access_mode =
-               (enum side_type_gather_access_mode) type_gather->u.side_string.access_mode;
+       enum side_type_gather_access_mode access_mode = side_enum_get(type_gather->u.side_string.access_mode);
        enum side_type_label_byte_order byte_order = side_enum_get(type_gather->u.side_string.type.byte_order);
        uint8_t unit_size = type_gather->u.side_string.type.unit_size;
        const char *ptr = (const char *) _ptr;
@@ -713,11 +704,11 @@ uint32_t visit_gather_elem(const struct side_type_visitor *type_visitor, const s
 {
        uint32_t len;
 
-       if (type_visitor->elem_func)
-               type_visitor->elem_func(SIDE_TYPE_VISITOR_BEFORE, type_desc, priv);
+       if (type_visitor->before_elem_func)
+               type_visitor->before_elem_func(type_desc, priv);
        len = visit_gather_type(type_visitor, type_desc, ptr, priv);
-       if (type_visitor->elem_func)
-               type_visitor->elem_func(SIDE_TYPE_VISITOR_AFTER, type_desc, priv);
+       if (type_visitor->after_elem_func)
+               type_visitor->after_elem_func(type_desc, priv);
        return len;
 }
 
@@ -726,8 +717,7 @@ uint32_t type_visitor_gather_enum(const struct side_type_visitor *type_visitor,
 {
        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;
+       enum side_type_gather_access_mode access_mode = side_enum_get(side_integer->access_mode);
        uint32_t integer_size_bytes = side_integer->type.integer_size;
        const char *ptr = (const char *) _ptr;
        union side_integer_value value;
@@ -752,11 +742,11 @@ uint32_t type_visitor_gather_enum(const struct side_type_visitor *type_visitor,
 static
 void visit_dynamic_field(const struct side_type_visitor *type_visitor, const struct side_arg_dynamic_field *field, void *priv)
 {
-       if (type_visitor->dynamic_field_func)
-               type_visitor->dynamic_field_func(SIDE_TYPE_VISITOR_BEFORE, field, priv);
+       if (type_visitor->before_dynamic_field_func)
+               type_visitor->before_dynamic_field_func(field, priv);
        visit_dynamic_type(type_visitor, &field->elem, priv);
-       if (type_visitor->dynamic_field_func)
-               type_visitor->dynamic_field_func(SIDE_TYPE_VISITOR_AFTER, field, priv);
+       if (type_visitor->after_dynamic_field_func)
+               type_visitor->after_dynamic_field_func(field, priv);
 }
 
 static
@@ -765,12 +755,12 @@ void type_visitor_dynamic_struct(const struct side_type_visitor *type_visitor, c
        const struct side_arg_dynamic_field *fields = side_ptr_get(dynamic_struct->fields);
        uint32_t i, len = dynamic_struct->len;
 
-       if (type_visitor->dynamic_struct_func)
-               type_visitor->dynamic_struct_func(SIDE_TYPE_VISITOR_BEFORE, dynamic_struct, priv);
+       if (type_visitor->before_dynamic_struct_func)
+               type_visitor->before_dynamic_struct_func(dynamic_struct, priv);
        for (i = 0; i < len; i++)
                visit_dynamic_field(type_visitor, &fields[i], priv);
-       if (type_visitor->dynamic_struct_func)
-               type_visitor->dynamic_struct_func(SIDE_TYPE_VISITOR_AFTER, dynamic_struct, priv);
+       if (type_visitor->after_dynamic_struct_func)
+               type_visitor->after_dynamic_struct_func(dynamic_struct, priv);
 }
 
 struct tracer_dynamic_struct_visitor_priv {
@@ -807,8 +797,8 @@ void type_visitor_dynamic_struct_visitor(const struct side_type_visitor *type_vi
        enum side_visitor_status status;
        void *app_ctx;
 
-       if (type_visitor->dynamic_struct_visitor_func)
-               type_visitor->dynamic_struct_visitor_func(SIDE_TYPE_VISITOR_BEFORE, item, priv);
+       if (type_visitor->before_dynamic_struct_visitor_func)
+               type_visitor->before_dynamic_struct_visitor_func(item, priv);
        dynamic_struct_visitor = side_ptr_get(item->u.side_dynamic.side_dynamic_struct_visitor);
        if (!dynamic_struct_visitor)
                abort();
@@ -821,8 +811,8 @@ void type_visitor_dynamic_struct_visitor(const struct side_type_visitor *type_vi
                fprintf(stderr, "ERROR: Visitor error\n");
                abort();
        }
-       if (type_visitor->dynamic_struct_visitor_func)
-               type_visitor->dynamic_struct_visitor_func(SIDE_TYPE_VISITOR_AFTER, item, priv);
+       if (type_visitor->after_dynamic_struct_visitor_func)
+               type_visitor->after_dynamic_struct_visitor_func(item, priv);
 }
 
 static
@@ -831,12 +821,12 @@ void type_visitor_dynamic_vla(const struct side_type_visitor *type_visitor, cons
        const struct side_arg *sav = side_ptr_get(vla->sav);
        uint32_t i, side_sav_len = vla->len;
 
-       if (type_visitor->dynamic_vla_func)
-               type_visitor->dynamic_vla_func(SIDE_TYPE_VISITOR_BEFORE, vla, priv);
+       if (type_visitor->before_dynamic_vla_func)
+               type_visitor->before_dynamic_vla_func(vla, priv);
        for (i = 0; i < side_sav_len; i++)
                visit_dynamic_elem(type_visitor, &sav[i], priv);
-       if (type_visitor->dynamic_vla_func)
-               type_visitor->dynamic_vla_func(SIDE_TYPE_VISITOR_AFTER, vla, priv);
+       if (type_visitor->after_dynamic_vla_func)
+               type_visitor->after_dynamic_vla_func(vla, priv);
 }
 
 struct tracer_dynamic_vla_visitor_priv {
@@ -873,8 +863,8 @@ void type_visitor_dynamic_vla_visitor(const struct side_type_visitor *type_visit
        enum side_visitor_status status;
        void *app_ctx;
 
-       if (type_visitor->dynamic_vla_visitor_func)
-               type_visitor->dynamic_vla_visitor_func(SIDE_TYPE_VISITOR_BEFORE, item, priv);
+       if (type_visitor->before_dynamic_vla_visitor_func)
+               type_visitor->before_dynamic_vla_visitor_func(item, priv);
        dynamic_vla_visitor = side_ptr_get(item->u.side_dynamic.side_dynamic_vla_visitor);
        if (!dynamic_vla_visitor)
                abort();
@@ -887,8 +877,8 @@ void type_visitor_dynamic_vla_visitor(const struct side_type_visitor *type_visit
                fprintf(stderr, "ERROR: Visitor error\n");
                abort();
        }
-       if (type_visitor->dynamic_vla_visitor_func)
-               type_visitor->dynamic_vla_visitor_func(SIDE_TYPE_VISITOR_AFTER, item, priv);
+       if (type_visitor->after_dynamic_vla_visitor_func)
+               type_visitor->after_dynamic_vla_visitor_func(item, priv);
 }
 
 static
@@ -947,11 +937,11 @@ void visit_dynamic_type(const struct side_type_visitor *type_visitor, const stru
 static
 void visit_dynamic_elem(const struct side_type_visitor *type_visitor, const struct side_arg *dynamic_item, void *priv)
 {
-       if (type_visitor->elem_func)
-               type_visitor->dynamic_elem_func(SIDE_TYPE_VISITOR_BEFORE, dynamic_item, priv);
+       if (type_visitor->before_dynamic_elem_func)
+               type_visitor->before_dynamic_elem_func(dynamic_item, priv);
        visit_dynamic_type(type_visitor, dynamic_item, priv);
-       if (type_visitor->elem_func)
-               type_visitor->dynamic_elem_func(SIDE_TYPE_VISITOR_AFTER, dynamic_item, priv);
+       if (type_visitor->after_dynamic_elem_func)
+               type_visitor->after_dynamic_elem_func(dynamic_item, priv);
 }
 
 void side_visit_type(const struct side_type_visitor *type_visitor, const struct side_type *type_desc, const struct side_arg *item, void *priv)
@@ -1185,26 +1175,26 @@ void type_visitor_event(const struct side_type_visitor *type_visitor,
                fprintf(stderr, "ERROR: number of fields mismatch between description and arguments\n");
                abort();
        }
-       if (type_visitor->event_func)
-               type_visitor->event_func(SIDE_TYPE_VISITOR_BEFORE, desc, side_arg_vec, var_struct, caller_addr, priv);
+       if (type_visitor->before_event_func)
+               type_visitor->before_event_func(desc, side_arg_vec, var_struct, caller_addr, priv);
        if (side_sav_len) {
-               if (type_visitor->static_fields_func)
-                       type_visitor->static_fields_func(SIDE_TYPE_VISITOR_BEFORE, side_arg_vec, priv);
+               if (type_visitor->before_static_fields_func)
+                       type_visitor->before_static_fields_func(side_arg_vec, priv);
                for (i = 0; i < side_sav_len; i++)
                        side_visit_field(type_visitor, &side_ptr_get(desc->fields)[i], &sav[i], priv);
-               if (type_visitor->static_fields_func)
-                       type_visitor->static_fields_func(SIDE_TYPE_VISITOR_AFTER, side_arg_vec, priv);
+               if (type_visitor->after_static_fields_func)
+                       type_visitor->after_static_fields_func(side_arg_vec, priv);
        }
        if (var_struct) {
                uint32_t var_struct_len = var_struct->len;
 
-               if (type_visitor->variadic_fields_func)
-                       type_visitor->variadic_fields_func(SIDE_TYPE_VISITOR_BEFORE, var_struct, priv);
+               if (type_visitor->before_variadic_fields_func)
+                       type_visitor->before_variadic_fields_func(var_struct, priv);
                for (i = 0; i < var_struct_len; i++)
                        visit_dynamic_field(type_visitor, &side_ptr_get(var_struct->fields)[i], priv);
-               if (type_visitor->variadic_fields_func)
-                       type_visitor->variadic_fields_func(SIDE_TYPE_VISITOR_AFTER, var_struct, priv);
+               if (type_visitor->after_variadic_fields_func)
+                       type_visitor->after_variadic_fields_func(var_struct, priv);
        }
-       if (type_visitor->event_func)
-               type_visitor->event_func(SIDE_TYPE_VISITOR_AFTER, desc, side_arg_vec, var_struct, caller_addr, priv);
+       if (type_visitor->after_event_func)
+               type_visitor->after_event_func(desc, side_arg_vec, var_struct, caller_addr, priv);
 }
index ab48ec70c53e14c9abf45c5ba7872e2deda044c6..30b15d4710aa72b5d8fe7a5ca7a4576b7b261742 100644 (file)
@@ -8,30 +8,27 @@
 
 #include <side/trace.h>
 
-enum side_type_visitor_location {
-       SIDE_TYPE_VISITOR_BEFORE,
-       SIDE_TYPE_VISITOR_AFTER,
-};
-
 struct side_type_visitor {
-       void (*event_func)(enum side_type_visitor_location loc,
-                       const struct side_event_description *desc,
+       void (*before_event_func)(const struct side_event_description *desc,
                        const struct side_arg_vec *side_arg_vec,
                        const struct side_arg_dynamic_struct *var_struct,
-                       void *caller_addr,
-                       void *priv);
-
-       void (*static_fields_func)(enum side_type_visitor_location loc,
+                       void *caller_addr, void *priv);
+       void (*after_event_func)(const struct side_event_description *desc,
                        const struct side_arg_vec *side_arg_vec,
-                       void *priv);
-
-       void (*variadic_fields_func)(enum side_type_visitor_location loc,
                        const struct side_arg_dynamic_struct *var_struct,
-                       void *priv);
+                       void *caller_addr, void *priv);
+
+       void (*before_static_fields_func)(const struct side_arg_vec *side_arg_vec, void *priv);
+       void (*after_static_fields_func)(const struct side_arg_vec *side_arg_vec, void *priv);
+
+       void (*before_variadic_fields_func)(const struct side_arg_dynamic_struct *var_struct, void *priv);
+       void (*after_variadic_fields_func)(const struct side_arg_dynamic_struct *var_struct, void *priv);
 
        /* Stack-copy basic types. */
-       void (*field_func)(enum side_type_visitor_location loc, const struct side_event_field *item_desc, void *priv);
-       void (*elem_func)(enum side_type_visitor_location loc, const struct side_type *type_desc, void *priv);
+       void (*before_field_func)(const struct side_event_field *item_desc, void *priv);
+       void (*after_field_func)(const struct side_event_field *item_desc, void *priv);
+       void (*before_elem_func)(const struct side_type *type_desc, void *priv);
+       void (*after_elem_func)(const struct side_type *type_desc, void *priv);
 
        void (*null_type_func)(const struct side_type *type_desc, const struct side_arg *item, void *priv);
        void (*bool_type_func)(const struct side_type *type_desc, const struct side_arg *item, void *priv);
@@ -42,10 +39,14 @@ struct side_type_visitor {
        void (*string_type_func)(const struct side_type *type_desc, const struct side_arg *item, void *priv);
 
        /* Stack-copy compound types. */
-       void (*struct_type_func)(enum side_type_visitor_location loc, const struct side_type_struct *side_struct, const struct side_arg_vec *side_arg_vec, void *priv);
-       void (*array_type_func)(enum side_type_visitor_location loc, const struct side_type_array *side_array, const struct side_arg_vec *side_arg_vec, void *priv);
-       void (*vla_type_func)(enum side_type_visitor_location loc, const struct side_type_vla *side_vla, const struct side_arg_vec *side_arg_vec, void *priv);
-       void (*vla_visitor_type_func)(enum side_type_visitor_location loc, const struct side_type_vla_visitor *side_vla_visitor, const struct side_arg_vla_visitor *side_arg_vla_visitor, void *priv);
+       void (*before_struct_type_func)(const struct side_type_struct *side_struct, const struct side_arg_vec *side_arg_vec, void *priv);
+       void (*after_struct_type_func)(const struct side_type_struct *side_struct, const struct side_arg_vec *side_arg_vec, void *priv);
+       void (*before_array_type_func)(const struct side_type_array *side_array, const struct side_arg_vec *side_arg_vec, void *priv);
+       void (*after_array_type_func)(const struct side_type_array *side_array, const struct side_arg_vec *side_arg_vec, void *priv);
+       void (*before_vla_type_func)(const struct side_type_vla *side_vla, const struct side_arg_vec *side_arg_vec, void *priv);
+       void (*after_vla_type_func)(const struct side_type_vla *side_vla, const struct side_arg_vec *side_arg_vec, void *priv);
+       void (*before_vla_visitor_type_func)(const struct side_type_vla_visitor *side_vla_visitor, const struct side_arg_vla_visitor *side_arg_vla_visitor, void *priv);
+       void (*after_vla_visitor_type_func)(const struct side_type_vla_visitor *side_vla_visitor, const struct side_arg_vla_visitor *side_arg_vla_visitor, void *priv);
 
        /* Stack-copy enumeration types. */
        void (*enum_type_func)(const struct side_type *type_desc, const struct side_arg *item, void *priv);
@@ -61,16 +62,21 @@ struct side_type_visitor {
                                enum side_type_label_byte_order byte_order, size_t strlen_with_null, void *priv);
 
        /* Gather compound types. */
-       void (*gather_struct_type_func)(enum side_type_visitor_location loc, const struct side_type_struct *type, void *priv);
-       void (*gather_array_type_func)(enum side_type_visitor_location loc, const struct side_type_array *type, void *priv);
-       void (*gather_vla_type_func)(enum side_type_visitor_location loc, const struct side_type_vla *type, uint32_t length, void *priv);
+       void (*before_gather_struct_type_func)(const struct side_type_struct *type, void *priv);
+       void (*after_gather_struct_type_func)(const struct side_type_struct *type, void *priv);
+       void (*before_gather_array_type_func)(const struct side_type_array *type, void *priv);
+       void (*after_gather_array_type_func)(const struct side_type_array *type, void *priv);
+       void (*before_gather_vla_type_func)(const struct side_type_vla *type, uint32_t length, void *priv);
+       void (*after_gather_vla_type_func)(const struct side_type_vla *type, uint32_t length, void *priv);
 
        /* Gather enumeration types. */
        void (*gather_enum_type_func)(const struct side_type_gather_enum *type, const union side_integer_value *value, void *priv);
 
        /* Dynamic basic types. */
-       void (*dynamic_field_func)(enum side_type_visitor_location loc, const struct side_arg_dynamic_field *field, void *priv);
-       void (*dynamic_elem_func)(enum side_type_visitor_location loc, const struct side_arg *dynamic_item, void *priv);
+       void (*before_dynamic_field_func)(const struct side_arg_dynamic_field *field, void *priv);
+       void (*after_dynamic_field_func)(const struct side_arg_dynamic_field *field, void *priv);
+       void (*before_dynamic_elem_func)(const struct side_arg *dynamic_item, void *priv);
+       void (*after_dynamic_elem_func)(const struct side_arg *dynamic_item, void *priv);
 
        void (*dynamic_null_func)(const struct side_arg *item, void *priv);
        void (*dynamic_bool_func)(const struct side_arg *item, void *priv);
@@ -81,10 +87,14 @@ struct side_type_visitor {
        void (*dynamic_string_func)(const struct side_arg *item, void *priv);
 
        /* Dynamic compound types. */
-       void (*dynamic_struct_func)(enum side_type_visitor_location loc, const struct side_arg_dynamic_struct *dynamic_struct, void *priv);
-       void (*dynamic_struct_visitor_func)(enum side_type_visitor_location loc, const struct side_arg *item, void *priv);
-       void (*dynamic_vla_func)(enum side_type_visitor_location loc, const struct side_arg_dynamic_vla *vla, void *priv);
-       void (*dynamic_vla_visitor_func)(enum side_type_visitor_location loc, const struct side_arg *item, void *priv);
+       void (*before_dynamic_struct_func)(const struct side_arg_dynamic_struct *dynamic_struct, void *priv);
+       void (*after_dynamic_struct_func)(const struct side_arg_dynamic_struct *dynamic_struct, void *priv);
+       void (*before_dynamic_struct_visitor_func)(const struct side_arg *item, void *priv);
+       void (*after_dynamic_struct_visitor_func)(const struct side_arg *item, void *priv);
+       void (*before_dynamic_vla_func)(const struct side_arg_dynamic_vla *vla, void *priv);
+       void (*after_dynamic_vla_func)(const struct side_arg_dynamic_vla *vla, void *priv);
+       void (*before_dynamic_vla_visitor_func)(const struct side_arg *item, void *priv);
+       void (*after_dynamic_vla_visitor_func)(const struct side_arg *item, void *priv);
 };
 
 void type_visitor_event(const struct side_type_visitor *type_visitor,
diff --git a/src/visit-description.c b/src/visit-description.c
new file mode 100644 (file)
index 0000000..8475289
--- /dev/null
@@ -0,0 +1,494 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright 2022-2024 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#include <string.h>
+
+#include "visit-description.h"
+
+static
+void side_visit_type(const struct side_description_visitor *description_visitor,
+               const struct side_type *type_desc, void *priv);
+
+static
+void visit_gather_type(const struct side_description_visitor *description_visitor,
+               const struct side_type *type_desc, void *priv);
+
+static
+void visit_gather_elem(const struct side_description_visitor *description_visitor,
+               const struct side_type *type_desc, void *priv);
+
+static
+void description_visitor_gather_enum(const struct side_description_visitor *description_visitor,
+               const struct side_type_gather *type_gather, void *priv);
+
+static
+void side_visit_elem(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
+{
+       if (description_visitor->before_elem_func)
+               description_visitor->before_elem_func(type_desc, priv);
+       side_visit_type(description_visitor, type_desc, priv);
+       if (description_visitor->after_elem_func)
+               description_visitor->after_elem_func(type_desc, priv);
+}
+
+static
+void side_visit_field(const struct side_description_visitor *description_visitor, const struct side_event_field *item_desc, void *priv)
+{
+       if (description_visitor->before_field_func)
+               description_visitor->before_field_func(item_desc, priv);
+       side_visit_type(description_visitor, &item_desc->side_type, priv);
+       if (description_visitor->after_field_func)
+               description_visitor->after_field_func(item_desc, priv);
+}
+
+static
+void side_visit_option(const struct side_description_visitor *description_visitor, const struct side_variant_option *option_desc, void *priv)
+{
+       if (description_visitor->before_option_func)
+               description_visitor->before_option_func(option_desc, priv);
+       side_visit_type(description_visitor, &option_desc->side_type, priv);
+       if (description_visitor->after_option_func)
+               description_visitor->after_option_func(option_desc, priv);
+}
+
+static
+void description_visitor_enum(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
+{
+       const struct side_type *elem_type = side_ptr_get(type_desc->u.side_enum.elem_type);
+
+       if (description_visitor->before_enum_type_func)
+               description_visitor->before_enum_type_func(type_desc, priv);
+       side_visit_elem(description_visitor, elem_type, priv);
+       if (description_visitor->after_enum_type_func)
+               description_visitor->after_enum_type_func(type_desc, priv);
+}
+
+static
+void description_visitor_enum_bitmap(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
+{
+       const struct side_type *elem_type = side_ptr_get(type_desc->u.side_enum_bitmap.elem_type);
+
+       if (description_visitor->before_enum_bitmap_type_func)
+               description_visitor->before_enum_bitmap_type_func(type_desc, priv);
+       side_visit_elem(description_visitor, elem_type, priv);
+       if (description_visitor->after_enum_bitmap_type_func)
+               description_visitor->after_enum_bitmap_type_func(type_desc, priv);
+}
+
+static
+void description_visitor_struct(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
+{
+       const struct side_type_struct *side_struct = side_ptr_get(type_desc->u.side_struct);
+       uint32_t i, len = side_struct->nr_fields;
+
+       if (description_visitor->before_struct_type_func)
+               description_visitor->before_struct_type_func(side_struct, priv);
+       for (i = 0; i < len; i++)
+               side_visit_field(description_visitor, &side_ptr_get(side_struct->fields)[i], priv);
+       if (description_visitor->after_struct_type_func)
+               description_visitor->after_struct_type_func(side_struct, priv);
+}
+
+static
+void description_visitor_variant(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
+{
+       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;
+       uint32_t i, len = side_type_variant->nr_options;
+
+       switch (side_enum_get(selector_type->type)) {
+       case SIDE_TYPE_U8:
+       case SIDE_TYPE_U16:
+       case SIDE_TYPE_U32:
+       case SIDE_TYPE_U64:
+       case SIDE_TYPE_U128:
+       case SIDE_TYPE_S8:
+       case SIDE_TYPE_S16:
+       case SIDE_TYPE_S32:
+       case SIDE_TYPE_S64:
+       case SIDE_TYPE_S128:
+               break;
+       default:
+               fprintf(stderr, "ERROR: Expecting integer variant selector type\n");
+               abort();
+       }
+       if (description_visitor->before_variant_type_func)
+               description_visitor->before_variant_type_func(side_type_variant, priv);
+       for (i = 0; i < len; i++)
+               side_visit_option(description_visitor, &side_ptr_get(side_type_variant->options)[i], priv);
+       if (description_visitor->after_variant_type_func)
+               description_visitor->after_variant_type_func(side_type_variant, priv);
+}
+
+static
+void description_visitor_array(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
+{
+       if (description_visitor->before_array_type_func)
+               description_visitor->before_array_type_func(&type_desc->u.side_array, priv);
+       side_visit_elem(description_visitor, side_ptr_get(type_desc->u.side_array.elem_type), priv);
+       if (description_visitor->after_array_type_func)
+               description_visitor->after_array_type_func(&type_desc->u.side_array, priv);
+}
+
+static
+void description_visitor_vla(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
+{
+       if (description_visitor->before_vla_type_func)
+               description_visitor->before_vla_type_func(&type_desc->u.side_vla, priv);
+       side_visit_elem(description_visitor, side_ptr_get(type_desc->u.side_vla.length_type), priv);
+       if (description_visitor->after_length_vla_type_func)
+               description_visitor->after_length_vla_type_func(&type_desc->u.side_vla, priv);
+       side_visit_elem(description_visitor, side_ptr_get(type_desc->u.side_vla.elem_type), priv);
+       if (description_visitor->after_element_vla_type_func)
+               description_visitor->after_element_vla_type_func(&type_desc->u.side_vla, priv);
+}
+
+static
+void description_visitor_vla_visitor(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
+{
+       if (description_visitor->before_vla_visitor_type_func)
+               description_visitor->before_vla_visitor_type_func(side_ptr_get(type_desc->u.side_vla_visitor), priv);
+       side_visit_elem(description_visitor, side_ptr_get(side_ptr_get(type_desc->u.side_vla_visitor)->length_type), priv);
+       if (description_visitor->after_length_vla_visitor_type_func)
+               description_visitor->after_length_vla_visitor_type_func(side_ptr_get(type_desc->u.side_vla_visitor), priv);
+       side_visit_elem(description_visitor, side_ptr_get(side_ptr_get(type_desc->u.side_vla_visitor)->elem_type), priv);
+       if (description_visitor->after_element_vla_visitor_type_func)
+               description_visitor->after_element_vla_visitor_type_func(side_ptr_get(type_desc->u.side_vla_visitor), priv);
+}
+
+static
+void visit_gather_field(const struct side_description_visitor *description_visitor, const struct side_event_field *field, void *priv)
+{
+       if (description_visitor->before_field_func)
+               description_visitor->before_field_func(field, priv);
+       (void) visit_gather_type(description_visitor, &field->side_type, priv);
+       if (description_visitor->after_field_func)
+               description_visitor->after_field_func(field, priv);
+}
+
+static
+void description_visitor_gather_struct(const struct side_description_visitor *description_visitor, const struct side_type_gather *type_gather, void *priv)
+{
+       const struct side_type_gather_struct *side_gather_struct = &type_gather->u.side_struct;
+       const struct side_type_struct *side_struct = side_ptr_get(side_gather_struct->type);
+       uint32_t i;
+
+       if (description_visitor->before_gather_struct_type_func)
+               description_visitor->before_gather_struct_type_func(side_gather_struct, priv);
+       for (i = 0; i < side_struct->nr_fields; i++)
+               visit_gather_field(description_visitor, &side_ptr_get(side_struct->fields)[i], priv);
+       if (description_visitor->after_gather_struct_type_func)
+               description_visitor->after_gather_struct_type_func(side_gather_struct, priv);
+}
+
+static
+void description_visitor_gather_array(const struct side_description_visitor *description_visitor, const struct side_type_gather *type_gather, void *priv)
+{
+       const struct side_type_gather_array *side_gather_array = &type_gather->u.side_array;
+       const struct side_type_array *side_array = &side_gather_array->type;
+       const struct side_type *elem_type = side_ptr_get(side_array->elem_type);
+
+       if (description_visitor->before_gather_array_type_func)
+               description_visitor->before_gather_array_type_func(side_gather_array, priv);
+       switch (side_enum_get(elem_type->type)) {
+       case SIDE_TYPE_GATHER_VLA:
+               fprintf(stderr, "<gather VLA only supported within gather structures>\n");
+               abort();
+       default:
+               break;
+       }
+       visit_gather_elem(description_visitor, elem_type, priv);
+       if (description_visitor->after_gather_array_type_func)
+               description_visitor->after_gather_array_type_func(side_gather_array, priv);
+}
+
+static
+void description_visitor_gather_vla(const struct side_description_visitor *description_visitor, const struct side_type_gather *type_gather, void *priv)
+{
+       const struct side_type_gather_vla *side_gather_vla = &type_gather->u.side_vla;
+       const struct side_type_vla *side_vla = &side_gather_vla->type;
+       const struct side_type *length_type = side_ptr_get(side_gather_vla->type.length_type);
+       const struct side_type *elem_type = side_ptr_get(side_vla->elem_type);
+
+       /* Access length */
+       switch (side_enum_get(length_type->type)) {
+       case SIDE_TYPE_GATHER_INTEGER:
+               break;
+       default:
+               fprintf(stderr, "<gather VLA expects integer gather length type>\n");
+               abort();
+       }
+       switch (side_enum_get(elem_type->type)) {
+       case SIDE_TYPE_GATHER_VLA:
+               fprintf(stderr, "<gather VLA only supported within gather structures>\n");
+               abort();
+       default:
+               break;
+       }
+       if (description_visitor->before_gather_vla_type_func)
+               description_visitor->before_gather_vla_type_func(side_gather_vla, priv);
+       visit_gather_elem(description_visitor, length_type, priv);
+       if (description_visitor->after_length_gather_vla_type_func)
+               description_visitor->after_length_gather_vla_type_func(side_gather_vla, priv);
+       visit_gather_elem(description_visitor, elem_type, priv);
+       if (description_visitor->after_element_gather_vla_type_func)
+               description_visitor->after_element_gather_vla_type_func(side_gather_vla, priv);
+}
+
+static
+void description_visitor_gather_bool(const struct side_description_visitor *description_visitor, const struct side_type_gather *type_gather, void *priv)
+{
+       if (description_visitor->gather_bool_type_func)
+               description_visitor->gather_bool_type_func(&type_gather->u.side_bool, priv);
+}
+
+static
+void description_visitor_gather_byte(const struct side_description_visitor *description_visitor, const struct side_type_gather *type_gather, void *priv)
+{
+       if (description_visitor->gather_byte_type_func)
+               description_visitor->gather_byte_type_func(&type_gather->u.side_byte, priv);
+}
+
+static
+void description_visitor_gather_integer(const struct side_description_visitor *description_visitor, const struct side_type_gather *type_gather,
+               enum side_type_label integer_type, void *priv)
+{
+       switch (integer_type) {
+       case SIDE_TYPE_GATHER_INTEGER:
+               if (description_visitor->gather_integer_type_func)
+                       description_visitor->gather_integer_type_func(&type_gather->u.side_integer, priv);
+               break;
+       case SIDE_TYPE_GATHER_POINTER:
+               if (description_visitor->gather_pointer_type_func)
+                       description_visitor->gather_pointer_type_func(&type_gather->u.side_integer, priv);
+               break;
+       default:
+               fprintf(stderr, "Unexpected integer type\n");
+               abort();
+       }
+}
+
+static
+void description_visitor_gather_float(const struct side_description_visitor *description_visitor, const struct side_type_gather *type_gather, void *priv)
+{
+       if (description_visitor->gather_float_type_func)
+               description_visitor->gather_float_type_func(&type_gather->u.side_float, priv);
+}
+
+static
+void description_visitor_gather_string(const struct side_description_visitor *description_visitor, const struct side_type_gather *type_gather, void *priv)
+{
+
+       if (description_visitor->gather_string_type_func)
+               description_visitor->gather_string_type_func(&type_gather->u.side_string, priv);
+}
+
+static
+void visit_gather_type(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
+{
+       switch (side_enum_get(type_desc->type)) {
+               /* Gather basic types */
+       case SIDE_TYPE_GATHER_BOOL:
+               description_visitor_gather_bool(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+       case SIDE_TYPE_GATHER_INTEGER:
+               description_visitor_gather_integer(description_visitor, &type_desc->u.side_gather, SIDE_TYPE_GATHER_INTEGER, priv);
+               break;
+       case SIDE_TYPE_GATHER_BYTE:
+               description_visitor_gather_byte(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+       case SIDE_TYPE_GATHER_POINTER:
+               description_visitor_gather_integer(description_visitor, &type_desc->u.side_gather, SIDE_TYPE_GATHER_POINTER, priv);
+               break;
+       case SIDE_TYPE_GATHER_FLOAT:
+               description_visitor_gather_float(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+       case SIDE_TYPE_GATHER_STRING:
+               description_visitor_gather_string(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+
+               /* Gather enumeration types */
+       case SIDE_TYPE_GATHER_ENUM:
+               description_visitor_gather_enum(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+
+               /* Gather compound types */
+       case SIDE_TYPE_GATHER_STRUCT:
+               description_visitor_gather_struct(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+       case SIDE_TYPE_GATHER_ARRAY:
+               description_visitor_gather_array(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+       case SIDE_TYPE_GATHER_VLA:
+               description_visitor_gather_vla(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+       default:
+               fprintf(stderr, "<UNKNOWN GATHER TYPE>");
+               abort();
+       }
+}
+
+static
+void visit_gather_elem(const struct side_description_visitor *description_visitor, const struct side_type *type_desc, void *priv)
+{
+       if (description_visitor->before_elem_func)
+               description_visitor->before_elem_func(type_desc, priv);
+       visit_gather_type(description_visitor, type_desc, priv);
+       if (description_visitor->after_elem_func)
+               description_visitor->after_elem_func(type_desc, priv);
+}
+
+static
+void description_visitor_gather_enum(const struct side_description_visitor *description_visitor, const struct side_type_gather *type_gather, void *priv)
+{
+       const struct side_type *elem_type = side_ptr_get(type_gather->u.side_enum.elem_type);
+
+       if (description_visitor->before_gather_enum_type_func)
+               description_visitor->before_gather_enum_type_func(&type_gather->u.side_enum, priv);
+       side_visit_elem(description_visitor, elem_type, priv);
+       if (description_visitor->after_gather_enum_type_func)
+               description_visitor->after_gather_enum_type_func(&type_gather->u.side_enum, priv);
+}
+
+static
+void side_visit_type(const struct side_description_visitor *description_visitor,
+               const struct side_type *type_desc, void *priv)
+{
+       enum side_type_label type = side_enum_get(type_desc->type);
+
+       switch (type) {
+               /* Stack-copy basic types */
+       case SIDE_TYPE_NULL:
+               if (description_visitor->null_type_func)
+                       description_visitor->null_type_func(type_desc, priv);
+               break;
+       case SIDE_TYPE_BOOL:
+               if (description_visitor->bool_type_func)
+                       description_visitor->bool_type_func(type_desc, priv);
+               break;
+       case SIDE_TYPE_U8:              /* Fallthrough */
+       case SIDE_TYPE_U16:             /* Fallthrough */
+       case SIDE_TYPE_U32:             /* Fallthrough */
+       case SIDE_TYPE_U64:             /* Fallthrough */
+       case SIDE_TYPE_U128:            /* Fallthrough */
+       case SIDE_TYPE_S8:              /* Fallthrough */
+       case SIDE_TYPE_S16:             /* Fallthrough */
+       case SIDE_TYPE_S32:             /* Fallthrough */
+       case SIDE_TYPE_S64:             /* Fallthrough */
+       case SIDE_TYPE_S128:
+               if (description_visitor->integer_type_func)
+                       description_visitor->integer_type_func(type_desc, priv);
+               break;
+       case SIDE_TYPE_BYTE:
+               if (description_visitor->byte_type_func)
+                       description_visitor->byte_type_func(type_desc, priv);
+               break;
+       case SIDE_TYPE_POINTER:
+               if (description_visitor->pointer_type_func)
+                       description_visitor->pointer_type_func(type_desc, priv);
+               break;
+       case SIDE_TYPE_FLOAT_BINARY16:  /* Fallthrough */
+       case SIDE_TYPE_FLOAT_BINARY32:  /* Fallthrough */
+       case SIDE_TYPE_FLOAT_BINARY64:  /* Fallthrough */
+       case SIDE_TYPE_FLOAT_BINARY128:
+               if (description_visitor->float_type_func)
+                       description_visitor->float_type_func(type_desc, priv);
+               break;
+       case SIDE_TYPE_STRING_UTF8:     /* Fallthrough */
+       case SIDE_TYPE_STRING_UTF16:    /* Fallthrough */
+       case SIDE_TYPE_STRING_UTF32:
+               if (description_visitor->string_type_func)
+                       description_visitor->string_type_func(type_desc, priv);
+               break;
+       case SIDE_TYPE_ENUM:
+               description_visitor_enum(description_visitor, type_desc, priv);
+               break;
+       case SIDE_TYPE_ENUM_BITMAP:
+               description_visitor_enum_bitmap(description_visitor, type_desc, priv);
+               break;
+
+               /* Stack-copy compound types */
+       case SIDE_TYPE_STRUCT:
+               description_visitor_struct(description_visitor, type_desc, priv);
+               break;
+       case SIDE_TYPE_VARIANT:
+               description_visitor_variant(description_visitor, type_desc, priv);
+               break;
+       case SIDE_TYPE_ARRAY:
+               description_visitor_array(description_visitor, type_desc, priv);
+               break;
+       case SIDE_TYPE_VLA:
+               description_visitor_vla(description_visitor, type_desc, priv);
+               break;
+       case SIDE_TYPE_VLA_VISITOR:
+               description_visitor_vla_visitor(description_visitor, type_desc, priv);
+               break;
+
+               /* Gather basic types */
+       case SIDE_TYPE_GATHER_BOOL:
+               description_visitor_gather_bool(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+       case SIDE_TYPE_GATHER_INTEGER:
+               description_visitor_gather_integer(description_visitor, &type_desc->u.side_gather, SIDE_TYPE_GATHER_INTEGER, priv);
+               break;
+       case SIDE_TYPE_GATHER_BYTE:
+               description_visitor_gather_byte(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+       case SIDE_TYPE_GATHER_POINTER:
+               description_visitor_gather_integer(description_visitor, &type_desc->u.side_gather, SIDE_TYPE_GATHER_POINTER, priv);
+               break;
+       case SIDE_TYPE_GATHER_FLOAT:
+               description_visitor_gather_float(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+       case SIDE_TYPE_GATHER_STRING:
+               description_visitor_gather_string(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+
+               /* Gather compound type */
+       case SIDE_TYPE_GATHER_STRUCT:
+               description_visitor_gather_struct(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+       case SIDE_TYPE_GATHER_ARRAY:
+               description_visitor_gather_array(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+       case SIDE_TYPE_GATHER_VLA:
+               description_visitor_gather_vla(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+
+               /* Gather enumeration types */
+       case SIDE_TYPE_GATHER_ENUM:
+               description_visitor_gather_enum(description_visitor, &type_desc->u.side_gather, priv);
+               break;
+
+       /* Dynamic type */
+       case SIDE_TYPE_DYNAMIC:
+               if (description_visitor->dynamic_type_func)
+                       description_visitor->dynamic_type_func(type_desc, priv);
+               break;
+
+       default:
+               fprintf(stderr, "<UNKNOWN TYPE>\n");
+               abort();
+       }
+}
+
+void description_visitor_event(const struct side_description_visitor *description_visitor,
+               const struct side_event_description *desc, void *priv)
+{
+       uint32_t i, len = desc->nr_fields;
+
+       if (description_visitor->before_event_func)
+               description_visitor->before_event_func(desc, priv);
+       if (len) {
+               if (description_visitor->before_static_fields_func)
+                       description_visitor->before_static_fields_func(desc, priv);
+               for (i = 0; i < len; i++)
+                       side_visit_field(description_visitor, &side_ptr_get(desc->fields)[i], priv);
+               if (description_visitor->after_static_fields_func)
+                       description_visitor->after_static_fields_func(desc, priv);
+       }
+       if (description_visitor->after_event_func)
+               description_visitor->after_event_func(desc, priv);
+}
diff --git a/src/visit-description.h b/src/visit-description.h
new file mode 100644 (file)
index 0000000..3f9ae6b
--- /dev/null
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright 2024 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#ifndef _VISIT_DESCRIPTION_H
+#define _VISIT_DESCRIPTION_H
+
+#include <side/trace.h>
+
+struct side_description_visitor {
+       void (*before_event_func)(const struct side_event_description *desc, void *priv);
+       void (*after_event_func)(const struct side_event_description *desc, void *priv);
+
+       void (*before_static_fields_func)(const struct side_event_description *desc, void *priv);
+       void (*after_static_fields_func)(const struct side_event_description *desc, void *priv);
+
+       /* Stack-copy basic types. */
+       void (*before_field_func)(const struct side_event_field *item_desc, void *priv);
+       void (*after_field_func)(const struct side_event_field *item_desc, void *priv);
+       void (*before_elem_func)(const struct side_type *type_desc, void *priv);
+       void (*after_elem_func)(const struct side_type *type_desc, void *priv);
+       void (*before_option_func)(const struct side_variant_option *option_desc, void *priv);
+       void (*after_option_func)(const struct side_variant_option *option_desc, void *priv);
+
+       void (*null_type_func)(const struct side_type *type_desc, void *priv);
+       void (*bool_type_func)(const struct side_type *type_desc, void *priv);
+       void (*integer_type_func)(const struct side_type *type_desc, void *priv);
+       void (*byte_type_func)(const struct side_type *type_desc, void *priv);
+       void (*pointer_type_func)(const struct side_type *type_desc, void *priv);
+       void (*float_type_func)(const struct side_type *type_desc, void *priv);
+       void (*string_type_func)(const struct side_type *type_desc, void *priv);
+
+       /* Stack-copy compound types. */
+       void (*before_struct_type_func)(const struct side_type_struct *side_struct, void *priv);
+       void (*after_struct_type_func)(const struct side_type_struct *side_struct, void *priv);
+       void (*before_variant_type_func)(const struct side_type_variant *side_variant, void *priv);
+       void (*after_variant_type_func)(const struct side_type_variant *side_variant, void *priv);
+       void (*before_array_type_func)(const struct side_type_array *side_array, void *priv);
+       void (*after_array_type_func)(const struct side_type_array *side_array, void *priv);
+       void (*before_vla_type_func)(const struct side_type_vla *side_vla, void *priv);
+       void (*after_length_vla_type_func)(const struct side_type_vla *side_vla, void *priv);
+       void (*after_element_vla_type_func)(const struct side_type_vla *side_vla, void *priv);
+       void (*before_vla_visitor_type_func)(const struct side_type_vla_visitor *side_vla_visitor, void *priv);
+       void (*after_length_vla_visitor_type_func)(const struct side_type_vla_visitor *side_vla_visitor, void *priv);
+       void (*after_element_vla_visitor_type_func)(const struct side_type_vla_visitor *side_vla_visitor, void *priv);
+
+       /* Stack-copy enumeration types. */
+       void (*before_enum_type_func)(const struct side_type *type_desc, void *priv);
+       void (*after_enum_type_func)(const struct side_type *type_desc, void *priv);
+       void (*before_enum_bitmap_type_func)(const struct side_type *type_desc, void *priv);
+       void (*after_enum_bitmap_type_func)(const struct side_type *type_desc, void *priv);
+
+       /* Gather basic types. */
+       void (*gather_bool_type_func)(const struct side_type_gather_bool *type, void *priv);
+       void (*gather_byte_type_func)(const struct side_type_gather_byte *type, void *priv);
+       void (*gather_integer_type_func)(const struct side_type_gather_integer *type, void *priv);
+       void (*gather_pointer_type_func)(const struct side_type_gather_integer *type, void *priv);
+       void (*gather_float_type_func)(const struct side_type_gather_float *type, void *priv);
+       void (*gather_string_type_func)(const struct side_type_gather_string *type, void *priv);
+
+       /* Gather compound types. */
+       void (*before_gather_struct_type_func)(const struct side_type_gather_struct *type, void *priv);
+       void (*after_gather_struct_type_func)(const struct side_type_gather_struct *type, void *priv);
+       void (*before_gather_array_type_func)(const struct side_type_gather_array *type, void *priv);
+       void (*after_gather_array_type_func)(const struct side_type_gather_array *type, void *priv);
+       void (*before_gather_vla_type_func)(const struct side_type_gather_vla *type, void *priv);
+       void (*after_length_gather_vla_type_func)(const struct side_type_gather_vla *type, void *priv);
+       void (*after_element_gather_vla_type_func)(const struct side_type_gather_vla *type, void *priv);
+
+       /* Gather enumeration types. */
+       void (*before_gather_enum_type_func)(const struct side_type_gather_enum *type, void *priv);
+       void (*after_gather_enum_type_func)(const struct side_type_gather_enum *type, void *priv);
+
+       /* Dynamic types. */
+       void (*dynamic_type_func)(const struct side_type *type_desc, void *priv);
+};
+
+void description_visitor_event(const struct side_description_visitor *description_visitor,
+               const struct side_event_description *desc, void *priv);
+
+#endif /* _VISIT_DESCRIPTION_H */
index ef5e7c0e920e021b8aff2ecb599d7b9d72421834..5f1b8f3e1cecb293e5ffa8b540d00e755fe9ec8c 100644 (file)
@@ -133,7 +133,7 @@ void test_array(void)
 
 side_static_event(my_provider_event_vla, "myprovider", "myvla", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field_vla("vla", side_elem(side_type_u32())),
+               side_field_vla("vla", side_elem(side_type_u32()), side_elem(side_type_u32())),
                side_field_s64("v"),
        )
 );
@@ -173,7 +173,13 @@ static uint32_t testarray[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
 
 side_static_event(my_provider_event_vla_visitor, "myprovider", "myvlavisit", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field_vla_visitor("vlavisit", side_elem(side_type_u32()), test_visitor),
+               side_field_vla_visitor("vlavisit",
+                       side_vla_visitor_literal(
+                               side_elem(side_type_u32()),
+                               side_elem(side_type_u32()),
+                               test_visitor
+                       )
+               ),
                side_field_s64("v"),
        )
 );
@@ -247,12 +253,20 @@ static uint32_t testarray2d[][2] = {
 side_static_event(my_provider_event_vla_visitor2d, "myprovider", "myvlavisit2d", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_vla_visitor("vlavisit2d",
-                       side_elem(
-                               side_type_vla_visitor(
-                                       side_elem(side_type_u32()),
-                                       test_inner_visitor
-                               )
-                       ), test_outer_visitor),
+                       side_vla_visitor_literal(
+                               side_elem(
+                                       side_type_vla_visitor(
+                                               side_vla_visitor_literal(
+                                                       side_elem(side_type_u32()),
+                                                       side_elem(side_type_u32()),
+                                                       test_inner_visitor
+                                               )
+                                       )
+                               ),
+                               side_elem(side_type_u32()),
+                               test_outer_visitor
+                       )
+               ),
                side_field_s64("v"),
        )
 );
@@ -1094,7 +1108,7 @@ side_static_event(my_provider_event_enum_bitmap, "myprovider", "myeventenumbitma
                side_field_enum_bitmap("bit_159", &myenum_bitmap,
                        side_elem(side_type_array(side_elem(side_type_u32()), 5))),
                side_field_enum_bitmap("bit_159", &myenum_bitmap,
-                       side_elem(side_type_vla(side_elem(side_type_u32())))),
+                       side_elem(side_type_vla(side_elem(side_type_u32()), side_elem(side_type_u32())))),
                side_field_enum_bitmap("bit_2_be", &myenum_bitmap, side_elem(side_type_u32_be())),
                side_field_enum_bitmap("bit_2_le", &myenum_bitmap, side_elem(side_type_u32_le())),
        )
This page took 0.100157 seconds and 4 git commands to generate.