Remove specific side_elem_* macros
[libside.git] / src / test.c
index 7e8a5391dce6aae811d019e20edfa17a2a30462d..5c301c541d996525acc09c7874635a4a5a3003a7 100644 (file)
@@ -16,9 +16,9 @@
 
 static side_define_event(my_provider_event, "myprovider", "myevent", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("abc", SIDE_TYPE_U32, side_attr_list()),
-               side_field("def", SIDE_TYPE_S64, side_attr_list()),
-               side_field("dynamic", SIDE_TYPE_DYNAMIC, side_attr_list()),
+               side_field_u32("abc", side_attr_list()),
+               side_field_s64("def", side_attr_list()),
+               side_field_dynamic("dynamic", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -31,19 +31,19 @@ void test_fields(void)
 
        my_provider_event.enabled = 1;
        side_event(&my_provider_event, side_arg_list(side_arg_u32(uw), side_arg_s64(sdw),
-               side_arg_dynamic(side_arg_dynamic_string("zzz"))));
+               side_arg_dynamic(side_arg_dynamic_string("zzz", side_attr_list()))));
 }
 
 static side_define_event(my_provider_event2, "myprovider", "myevent2", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_struct("structfield",
                        side_field_list(
-                               side_field("x", SIDE_TYPE_U32, side_attr_list()),
-                               side_field("y", SIDE_TYPE_S64, side_attr_list()),
+                               side_field_u32("x", side_attr_list()),
+                               side_field_s64("y", side_attr_list()),
                        ),
                        side_attr_list()
                ),
-               side_field("z", SIDE_TYPE_U8, side_attr_list()),
+               side_field_u8("z", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -60,8 +60,8 @@ void test_struct(void)
 
 static side_define_event(my_provider_event_array, "myprovider", "myarray", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field_array("arr", side_elem_type(SIDE_TYPE_U32, side_attr_list()), 3, side_attr_list()),
-               side_field("v", SIDE_TYPE_S64, side_attr_list()),
+               side_field_array("arr", side_elem(side_type_u32(side_attr_list())), 3, side_attr_list()),
+               side_field_s64("v", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -78,8 +78,8 @@ void test_array(void)
 
 static side_define_event(my_provider_event_vla, "myprovider", "myvla", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field_vla("vla", side_elem_type(SIDE_TYPE_U32, side_attr_list()), side_attr_list()),
-               side_field("v", SIDE_TYPE_S64, side_attr_list()),
+               side_field_vla("vla", side_elem(side_type_u32(side_attr_list())), side_attr_list()),
+               side_field_s64("v", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -108,12 +108,8 @@ enum side_visitor_status test_visitor(const struct side_tracer_visitor_ctx *trac
        uint32_t length = ctx->length, i;
 
        for (i = 0; i < length; i++) {
-               const struct side_arg_vec elem = {
-                       .type = SIDE_TYPE_U32,
-                       .u = {
-                               .side_u32 = ctx->ptr[i],
-                       },
-               };
+               const struct side_arg_vec elem = side_arg_u32(ctx->ptr[i]);
+
                if (tracer_ctx->write_elem(tracer_ctx, &elem) != SIDE_VISITOR_STATUS_OK)
                        return SIDE_VISITOR_STATUS_ERROR;
        }
@@ -124,8 +120,8 @@ static uint32_t testarray[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
 
 static side_define_event(my_provider_event_vla_visitor, "myprovider", "myvlavisit", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field_vla_visitor("vlavisit", side_elem_type(SIDE_TYPE_U32, side_attr_list()), test_visitor, side_attr_list()),
-               side_field("v", SIDE_TYPE_S64, side_attr_list()),
+               side_field_vla_visitor("vlavisit", side_elem(side_type_u32(side_attr_list())), test_visitor, side_attr_list()),
+               side_field_s64("v", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -157,12 +153,8 @@ enum side_visitor_status test_inner_visitor(const struct side_tracer_visitor_ctx
        uint32_t length = ctx->length, i;
 
        for (i = 0; i < length; i++) {
-               const struct side_arg_vec elem = {
-                       .type = SIDE_TYPE_U32,
-                       .u = {
-                               .side_u32 = ctx->ptr[i],
-                       },
-               };
+               const struct side_arg_vec elem = side_arg_u32(ctx->ptr[i]);
+
                if (tracer_ctx->write_elem(tracer_ctx, &elem) != SIDE_VISITOR_STATUS_OK)
                        return SIDE_VISITOR_STATUS_ERROR;
        }
@@ -202,12 +194,12 @@ static side_define_event(my_provider_event_vla_visitor2d, "myprovider", "myvlavi
        side_field_list(
                side_field_vla_visitor("vlavisit2d",
                        side_elem(
-                               side_type_vla_visitor_decl(
-                                       side_elem_type(SIDE_TYPE_U32, side_attr_list()),
+                               side_type_vla_visitor(
+                                       side_elem(side_type_u32(side_attr_list())),
                                        test_inner_visitor,
                                        side_attr_list())
                        ), test_outer_visitor, side_attr_list()),
-               side_field("v", SIDE_TYPE_S64, side_attr_list()),
+               side_field_s64("v", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -229,8 +221,8 @@ static int64_t array_fixint[] = { -444, 555, 123, 2897432587 };
 
 static side_define_event(my_provider_event_array_fixint, "myprovider", "myarrayfixint", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field_array("arrfixint", side_elem_type(SIDE_TYPE_S64, side_attr_list()), SIDE_ARRAY_SIZE(array_fixint), side_attr_list()),
-               side_field("v", SIDE_TYPE_S64, side_attr_list()),
+               side_field_array("arrfixint", side_elem(side_type_s64(side_attr_list())), SIDE_ARRAY_SIZE(array_fixint), side_attr_list()),
+               side_field_s64("v", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -247,8 +239,8 @@ static int64_t vla_fixint[] = { -444, 555, 123, 2897432587 };
 
 static side_define_event(my_provider_event_vla_fixint, "myprovider", "myvlafixint", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field_vla("vlafixint", side_elem_type(SIDE_TYPE_S64, side_attr_list()), side_attr_list()),
-               side_field("v", SIDE_TYPE_S64, side_attr_list()),
+               side_field_vla("vlafixint", side_elem(side_type_s64(side_attr_list())), side_attr_list()),
+               side_field_s64("v", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -264,7 +256,7 @@ void test_vla_fixint(void)
 static side_define_event(my_provider_event_dynamic_basic,
        "myprovider", "mydynamicbasic", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("dynamic", SIDE_TYPE_DYNAMIC, side_attr_list()),
+               side_field_dynamic("dynamic", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -274,13 +266,13 @@ void test_dynamic_basic_type(void)
 {
        my_provider_event_dynamic_basic.enabled = 1;
        side_event(&my_provider_event_dynamic_basic,
-               side_arg_list(side_arg_dynamic(side_arg_dynamic_s16(-33))));
+               side_arg_list(side_arg_dynamic(side_arg_dynamic_s16(-33, side_attr_list()))));
 }
 
 static side_define_event(my_provider_event_dynamic_vla,
        "myprovider", "mydynamicvla", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("dynamic", SIDE_TYPE_DYNAMIC, side_attr_list()),
+               side_field_dynamic("dynamic", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -290,18 +282,20 @@ void test_dynamic_vla(void)
 {
        side_arg_dynamic_define_vec(myvla,
                side_arg_list(
-                       side_arg_dynamic_u32(1), side_arg_dynamic_u32(2), side_arg_dynamic_u32(3),
+                       side_arg_dynamic_u32(1, side_attr_list()),
+                       side_arg_dynamic_u32(2, side_attr_list()),
+                       side_arg_dynamic_u32(3, side_attr_list()),
                )
        );
        my_provider_event_dynamic_vla.enabled = 1;
        side_event(&my_provider_event_dynamic_vla,
-               side_arg_list(side_arg_dynamic(side_arg_dynamic_vla(&myvla))));
+               side_arg_list(side_arg_dynamic(side_arg_dynamic_vla(&myvla, side_attr_list()))));
 }
 
 static side_define_event(my_provider_event_dynamic_null,
        "myprovider", "mydynamicnull", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("dynamic", SIDE_TYPE_DYNAMIC, side_attr_list()),
+               side_field_dynamic("dynamic", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -311,13 +305,13 @@ void test_dynamic_null(void)
 {
        my_provider_event_dynamic_null.enabled = 1;
        side_event(&my_provider_event_dynamic_null,
-               side_arg_list(side_arg_dynamic(side_arg_dynamic_null())));
+               side_arg_list(side_arg_dynamic(side_arg_dynamic_null(side_attr_list()))));
 }
 
 static side_define_event(my_provider_event_dynamic_struct,
        "myprovider", "mydynamicstruct", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("dynamic", SIDE_TYPE_DYNAMIC, side_attr_list()),
+               side_field_dynamic("dynamic", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -327,21 +321,21 @@ void test_dynamic_struct(void)
 {
        side_arg_dynamic_define_struct(mystruct,
                side_arg_list(
-                       side_arg_dynamic_field("a", side_arg_dynamic_u32(43)),
-                       side_arg_dynamic_field("b", side_arg_dynamic_string("zzz")),
-                       side_arg_dynamic_field("c", side_arg_dynamic_null()),
+                       side_arg_dynamic_field("a", side_arg_dynamic_u32(43, side_attr_list())),
+                       side_arg_dynamic_field("b", side_arg_dynamic_string("zzz", side_attr_list())),
+                       side_arg_dynamic_field("c", side_arg_dynamic_null(side_attr_list())),
                )
        );
 
        my_provider_event_dynamic_struct.enabled = 1;
        side_event(&my_provider_event_dynamic_struct,
-               side_arg_list(side_arg_dynamic(side_arg_dynamic_struct(&mystruct))));
+               side_arg_list(side_arg_dynamic(side_arg_dynamic_struct(&mystruct, side_attr_list()))));
 }
 
 static side_define_event(my_provider_event_dynamic_nested_struct,
        "myprovider", "mydynamicnestedstruct", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("dynamic", SIDE_TYPE_DYNAMIC, side_attr_list()),
+               side_field_dynamic("dynamic", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -351,31 +345,31 @@ void test_dynamic_nested_struct(void)
 {
        side_arg_dynamic_define_struct(nested,
                side_arg_list(
-                       side_arg_dynamic_field("a", side_arg_dynamic_u32(43)),
-                       side_arg_dynamic_field("b", side_arg_dynamic_u8(55)),
+                       side_arg_dynamic_field("a", side_arg_dynamic_u32(43, side_attr_list())),
+                       side_arg_dynamic_field("b", side_arg_dynamic_u8(55, side_attr_list())),
                )
        );
        side_arg_dynamic_define_struct(nested2,
                side_arg_list(
-                       side_arg_dynamic_field("aa", side_arg_dynamic_u64(128)),
-                       side_arg_dynamic_field("bb", side_arg_dynamic_u16(1)),
+                       side_arg_dynamic_field("aa", side_arg_dynamic_u64(128, side_attr_list())),
+                       side_arg_dynamic_field("bb", side_arg_dynamic_u16(1, side_attr_list())),
                )
        );
        side_arg_dynamic_define_struct(mystruct,
                side_arg_list(
-                       side_arg_dynamic_field("nested", side_arg_dynamic_struct(&nested)),
-                       side_arg_dynamic_field("nested2", side_arg_dynamic_struct(&nested2)),
+                       side_arg_dynamic_field("nested", side_arg_dynamic_struct(&nested, side_attr_list())),
+                       side_arg_dynamic_field("nested2", side_arg_dynamic_struct(&nested2, side_attr_list())),
                )
        );
        my_provider_event_dynamic_nested_struct.enabled = 1;
        side_event(&my_provider_event_dynamic_nested_struct,
-               side_arg_list(side_arg_dynamic(side_arg_dynamic_struct(&mystruct))));
+               side_arg_list(side_arg_dynamic(side_arg_dynamic_struct(&mystruct, side_attr_list()))));
 }
 
 static side_define_event(my_provider_event_dynamic_vla_struct,
        "myprovider", "mydynamicvlastruct", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("dynamic", SIDE_TYPE_DYNAMIC, side_attr_list()),
+               side_field_dynamic("dynamic", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -385,27 +379,27 @@ void test_dynamic_vla_struct(void)
 {
        side_arg_dynamic_define_struct(nested,
                side_arg_list(
-                       side_arg_dynamic_field("a", side_arg_dynamic_u32(43)),
-                       side_arg_dynamic_field("b", side_arg_dynamic_u8(55)),
+                       side_arg_dynamic_field("a", side_arg_dynamic_u32(43, side_attr_list())),
+                       side_arg_dynamic_field("b", side_arg_dynamic_u8(55, side_attr_list())),
                )
        );
        side_arg_dynamic_define_vec(myvla,
                side_arg_list(
-                       side_arg_dynamic_struct(&nested),
-                       side_arg_dynamic_struct(&nested),
-                       side_arg_dynamic_struct(&nested),
-                       side_arg_dynamic_struct(&nested),
+                       side_arg_dynamic_struct(&nested, side_attr_list()),
+                       side_arg_dynamic_struct(&nested, side_attr_list()),
+                       side_arg_dynamic_struct(&nested, side_attr_list()),
+                       side_arg_dynamic_struct(&nested, side_attr_list()),
                )
        );
        my_provider_event_dynamic_vla_struct.enabled = 1;
        side_event(&my_provider_event_dynamic_vla_struct,
-               side_arg_list(side_arg_dynamic(side_arg_dynamic_vla(&myvla))));
+               side_arg_list(side_arg_dynamic(side_arg_dynamic_vla(&myvla, side_attr_list()))));
 }
 
 static side_define_event(my_provider_event_dynamic_struct_vla,
        "myprovider", "mydynamicstructvla", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("dynamic", SIDE_TYPE_DYNAMIC, side_attr_list()),
+               side_field_dynamic("dynamic", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -415,29 +409,33 @@ void test_dynamic_struct_vla(void)
 {
        side_arg_dynamic_define_vec(myvla,
                side_arg_list(
-                       side_arg_dynamic_u32(1), side_arg_dynamic_u32(2), side_arg_dynamic_u32(3),
+                       side_arg_dynamic_u32(1, side_attr_list()),
+                       side_arg_dynamic_u32(2, side_attr_list()),
+                       side_arg_dynamic_u32(3, side_attr_list()),
                )
        );
        side_arg_dynamic_define_vec(myvla2,
                side_arg_list(
-                       side_arg_dynamic_u32(4), side_arg_dynamic_u64(5), side_arg_dynamic_u32(6),
+                       side_arg_dynamic_u32(4, side_attr_list()),
+                       side_arg_dynamic_u64(5, side_attr_list()),
+                       side_arg_dynamic_u32(6, side_attr_list()),
                )
        );
        side_arg_dynamic_define_struct(mystruct,
                side_arg_list(
-                       side_arg_dynamic_field("a", side_arg_dynamic_vla(&myvla)),
-                       side_arg_dynamic_field("b", side_arg_dynamic_vla(&myvla2)),
+                       side_arg_dynamic_field("a", side_arg_dynamic_vla(&myvla, side_attr_list())),
+                       side_arg_dynamic_field("b", side_arg_dynamic_vla(&myvla2, side_attr_list())),
                )
        );
        my_provider_event_dynamic_struct_vla.enabled = 1;
        side_event(&my_provider_event_dynamic_struct_vla,
-               side_arg_list(side_arg_dynamic(side_arg_dynamic_struct(&mystruct))));
+               side_arg_list(side_arg_dynamic(side_arg_dynamic_struct(&mystruct, side_attr_list()))));
 }
 
 static side_define_event(my_provider_event_dynamic_nested_vla,
        "myprovider", "mydynamicnestedvla", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("dynamic", SIDE_TYPE_DYNAMIC, side_attr_list()),
+               side_field_dynamic("dynamic", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -447,23 +445,27 @@ void test_dynamic_nested_vla(void)
 {
        side_arg_dynamic_define_vec(nestedvla,
                side_arg_list(
-                       side_arg_dynamic_u32(1), side_arg_dynamic_u16(2), side_arg_dynamic_u32(3),
+                       side_arg_dynamic_u32(1, side_attr_list()),
+                       side_arg_dynamic_u16(2, side_attr_list()),
+                       side_arg_dynamic_u32(3, side_attr_list()),
                )
        );
        side_arg_dynamic_define_vec(nestedvla2,
                side_arg_list(
-                       side_arg_dynamic_u8(4), side_arg_dynamic_u32(5), side_arg_dynamic_u32(6),
+                       side_arg_dynamic_u8(4, side_attr_list()),
+                       side_arg_dynamic_u32(5, side_attr_list()),
+                       side_arg_dynamic_u32(6, side_attr_list()),
                )
        );
        side_arg_dynamic_define_vec(myvla,
                side_arg_list(
-                       side_arg_dynamic_vla(&nestedvla),
-                       side_arg_dynamic_vla(&nestedvla2),
+                       side_arg_dynamic_vla(&nestedvla, side_attr_list()),
+                       side_arg_dynamic_vla(&nestedvla2, side_attr_list()),
                )
        );
        my_provider_event_dynamic_nested_vla.enabled = 1;
        side_event(&my_provider_event_dynamic_nested_vla,
-               side_arg_list(side_arg_dynamic(side_arg_dynamic_vla(&myvla))));
+               side_arg_list(side_arg_dynamic(side_arg_dynamic_vla(&myvla, side_attr_list()))));
 }
 
 static side_define_event_variadic(my_provider_event_variadic,
@@ -479,8 +481,8 @@ void test_variadic(void)
        side_event_variadic(&my_provider_event_variadic,
                side_arg_list(),
                side_arg_list(
-                       side_arg_dynamic_field("a", side_arg_dynamic_u32(55)),
-                       side_arg_dynamic_field("b", side_arg_dynamic_s8(-4)),
+                       side_arg_dynamic_field("a", side_arg_dynamic_u32(55, side_attr_list())),
+                       side_arg_dynamic_field("b", side_arg_dynamic_s8(-4, side_attr_list())),
                )
        );
 }
@@ -488,8 +490,8 @@ void test_variadic(void)
 static side_define_event_variadic(my_provider_event_static_variadic,
        "myprovider", "mystaticvariadicevent", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("abc", SIDE_TYPE_U32, side_attr_list()),
-               side_field("def", SIDE_TYPE_U16, side_attr_list()),
+               side_field_u32("abc", side_attr_list()),
+               side_field_u16("def", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -504,21 +506,21 @@ void test_static_variadic(void)
                        side_arg_u16(2),
                ),
                side_arg_list(
-                       side_arg_dynamic_field("a", side_arg_dynamic_u32(55)),
-                       side_arg_dynamic_field("b", side_arg_dynamic_s8(-4)),
+                       side_arg_dynamic_field("a", side_arg_dynamic_u32(55, side_attr_list())),
+                       side_arg_dynamic_field("b", side_arg_dynamic_s8(-4, side_attr_list())),
                )
        );
 }
 
 static side_define_event(my_provider_event_bool, "myprovider", "myeventbool", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("a_false", SIDE_TYPE_BOOL, side_attr_list()),
-               side_field("b_true", SIDE_TYPE_BOOL, side_attr_list()),
-               side_field("c_true", SIDE_TYPE_BOOL, side_attr_list()),
-               side_field("d_true", SIDE_TYPE_BOOL, side_attr_list()),
-               side_field("e_true", SIDE_TYPE_BOOL, side_attr_list()),
-               side_field("f_false", SIDE_TYPE_BOOL, side_attr_list()),
-               side_field("g_true", SIDE_TYPE_BOOL, side_attr_list()),
+               side_field_bool("a_false", side_attr_list()),
+               side_field_bool("b_true", side_attr_list()),
+               side_field_bool("c_true", side_attr_list()),
+               side_field_bool("d_true", side_attr_list()),
+               side_field_bool("e_true", side_attr_list()),
+               side_field_bool("f_false", side_attr_list()),
+               side_field_bool("g_true", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -561,10 +563,10 @@ void test_dynamic_bool(void)
        side_event_variadic(&my_provider_event_dynamic_bool,
                side_arg_list(),
                side_arg_list(
-                       side_arg_dynamic_field("a_true", side_arg_dynamic_bool(55)),
-                       side_arg_dynamic_field("b_true", side_arg_dynamic_bool(-4)),
-                       side_arg_dynamic_field("c_false", side_arg_dynamic_bool(0)),
-                       side_arg_dynamic_field("d_true", side_arg_dynamic_bool(256)),
+                       side_arg_dynamic_field("a_true", side_arg_dynamic_bool(55, side_attr_list())),
+                       side_arg_dynamic_field("b_true", side_arg_dynamic_bool(-4, side_attr_list())),
+                       side_arg_dynamic_field("c_false", side_arg_dynamic_bool(0, side_attr_list())),
+                       side_arg_dynamic_field("d_true", side_arg_dynamic_bool(256, side_attr_list())),
                )
        );
 }
@@ -572,7 +574,7 @@ void test_dynamic_bool(void)
 static side_define_event(my_provider_event_dynamic_vla_visitor,
        "myprovider", "mydynamicvlavisitor", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("dynamic", SIDE_TYPE_DYNAMIC, side_attr_list()),
+               side_field_dynamic("dynamic", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -591,6 +593,8 @@ enum side_visitor_status test_dynamic_vla_visitor(const struct side_tracer_dynam
        for (i = 0; i < length; i++) {
                const struct side_arg_dynamic_vec elem = {
                        .dynamic_type = SIDE_DYNAMIC_TYPE_U32,
+                       .nr_attr = 0,
+                       .attr = NULL,
                        .u = {
                                .side_u32 = ctx->ptr[i],
                        },
@@ -615,7 +619,7 @@ void test_dynamic_vla_with_visitor(void)
                side_event_call(&my_provider_event_dynamic_vla_visitor,
                        side_arg_list(
                                side_arg_dynamic(
-                                       side_arg_dynamic_vla_visitor(test_dynamic_vla_visitor, &ctx)
+                                       side_arg_dynamic_vla_visitor(test_dynamic_vla_visitor, &ctx, side_attr_list())
                                )
                        )
                );
@@ -625,7 +629,7 @@ void test_dynamic_vla_with_visitor(void)
 static side_define_event(my_provider_event_dynamic_struct_visitor,
        "myprovider", "mydynamicstructvisitor", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("dynamic", SIDE_TYPE_DYNAMIC, side_attr_list()),
+               side_field_dynamic("dynamic", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -651,6 +655,8 @@ enum side_visitor_status test_dynamic_struct_visitor(const struct side_tracer_dy
                        .field_name = ctx->ptr[i].name,
                        .elem = {
                                .dynamic_type = SIDE_DYNAMIC_TYPE_U32,
+                               .nr_attr = 0,
+                               .attr = NULL,
                                .u = {
                                        .side_u32 = ctx->ptr[i].value,
                                },
@@ -681,21 +687,21 @@ void test_dynamic_struct_with_visitor(void)
                side_event_call(&my_provider_event_dynamic_struct_visitor,
                        side_arg_list(
                                side_arg_dynamic(
-                                       side_arg_dynamic_struct_visitor(test_dynamic_struct_visitor, &ctx)
+                                       side_arg_dynamic_struct_visitor(test_dynamic_struct_visitor, &ctx, side_attr_list())
                                )
                        )
                );
        }
 }
 
-static side_define_event(my_provider_event_user_attribute, "myprovider", "myevent", SIDE_LOGLEVEL_DEBUG,
+static side_define_event(my_provider_event_user_attribute, "myprovider", "myevent_user_attribute", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("abc", SIDE_TYPE_U32, side_attr_list()),
-               side_field("def", SIDE_TYPE_S64, side_attr_list()),
+               side_field_u32("abc", side_attr_list()),
+               side_field_s64("def", side_attr_list()),
        ),
        side_attr_list(
-               side_attr("user_attribute_a", "val1"),
-               side_attr("user_attribute_b", "val2"),
+               side_attr("user_attribute_a", side_attr_string("val1")),
+               side_attr("user_attribute_b", side_attr_string("val2")),
        )
 );
 
@@ -706,6 +712,295 @@ void test_event_user_attribute(void)
        side_event(&my_provider_event_user_attribute, side_arg_list(side_arg_u32(1), side_arg_s64(2)));
 }
 
+static side_define_event(my_provider_field_user_attribute, "myprovider", "myevent_field_attribute", SIDE_LOGLEVEL_DEBUG,
+       side_field_list(
+               side_field_u32("abc",
+                       side_attr_list(
+                               side_attr("user_attribute_a", side_attr_string("val1")),
+                               side_attr("user_attribute_b", side_attr_u32(2)),
+                       )
+               ),
+               side_field_s64("def",
+                       side_attr_list(
+                               side_attr("user_attribute_c", side_attr_string("val3")),
+                               side_attr("user_attribute_d", side_attr_s64(-5)),
+                       )
+               ),
+       ),
+       side_attr_list()
+);
+
+static
+void test_field_user_attribute(void)
+{
+       my_provider_field_user_attribute.enabled = 1;
+       side_event(&my_provider_field_user_attribute, side_arg_list(side_arg_u32(1), side_arg_s64(2)));
+}
+
+static side_define_event_variadic(my_provider_event_variadic_attr,
+       "myprovider", "myvariadiceventattr", SIDE_LOGLEVEL_DEBUG,
+       side_field_list(),
+       side_attr_list()
+);
+
+static
+void test_variadic_attr(void)
+{
+       my_provider_event_variadic_attr.enabled = 1;
+       side_event_variadic(&my_provider_event_variadic_attr,
+               side_arg_list(),
+               side_arg_list(
+                       side_arg_dynamic_field("a",
+                               side_arg_dynamic_u32(55,
+                                       side_attr_list(
+                                               side_attr("user_attribute_c", side_attr_string("valX")),
+                                               side_attr("user_attribute_d", side_attr_u8(55)),
+                                       )
+                               )
+                       ),
+                       side_arg_dynamic_field("b",
+                               side_arg_dynamic_s8(-4,
+                                       side_attr_list(
+                                               side_attr("X", side_attr_u8(1)),
+                                               side_attr("Y", side_attr_s8(2)),
+                                       )
+                               )
+                       ),
+               )
+       );
+}
+
+static side_define_event_variadic(my_provider_event_variadic_vla_attr,
+       "myprovider", "myvariadiceventvlaattr", SIDE_LOGLEVEL_DEBUG,
+       side_field_list(),
+       side_attr_list()
+);
+
+static
+void test_variadic_vla_attr(void)
+{
+       side_arg_dynamic_define_vec(myvla,
+               side_arg_list(
+                       side_arg_dynamic_u32(1,
+                               side_attr_list(
+                                       side_attr("Z", side_attr_u8(0)),
+                                       side_attr("A", side_attr_u8(123)),
+                               )
+                       ),
+                       side_arg_dynamic_u32(2, side_attr_list()),
+                       side_arg_dynamic_u32(3, side_attr_list()),
+               )
+       );
+       my_provider_event_variadic_vla_attr.enabled = 1;
+       side_event_variadic(&my_provider_event_variadic_vla_attr,
+               side_arg_list(),
+               side_arg_list(
+                       side_arg_dynamic_field("a",
+                               side_arg_dynamic_vla(&myvla,
+                                       side_attr_list(
+                                               side_attr("X", side_attr_u8(1)),
+                                               side_attr("Y", side_attr_u8(2)),
+                                       )
+                               )
+                       ),
+               )
+       );
+}
+
+static side_define_event_variadic(my_provider_event_variadic_struct_attr,
+       "myprovider", "myvariadiceventstructattr", SIDE_LOGLEVEL_DEBUG,
+       side_field_list(),
+       side_attr_list()
+);
+
+static
+void test_variadic_struct_attr(void)
+{
+       my_provider_event_variadic_struct_attr.enabled = 1;
+       side_event_cond(&my_provider_event_variadic_struct_attr) {
+               side_arg_dynamic_define_struct(mystruct,
+                       side_arg_list(
+                               side_arg_dynamic_field("a",
+                                       side_arg_dynamic_u32(43,
+                                               side_attr_list(
+                                                       side_attr("A", side_attr_bool(true)),
+                                               )
+                                       )
+                               ),
+                               side_arg_dynamic_field("b", side_arg_dynamic_u8(55, side_attr_list())),
+                       )
+               );
+               side_event_call_variadic(&my_provider_event_variadic_struct_attr,
+                       side_arg_list(),
+                       side_arg_list(
+                               side_arg_dynamic_field("a",
+                                       side_arg_dynamic_struct(&mystruct,
+                                               side_attr_list(
+                                                       side_attr("X", side_attr_u8(1)),
+                                                       side_attr("Y", side_attr_u8(2)),
+                                               )
+                                       )
+                               ),
+                       )
+               );
+       }
+}
+
+static side_define_event(my_provider_event_float, "myprovider", "myeventfloat", SIDE_LOGLEVEL_DEBUG,
+       side_field_list(
+#if __HAVE_FLOAT16
+               side_field_float_binary16("binary16", side_attr_list()),
+#endif
+#if __HAVE_FLOAT32
+               side_field_float_binary32("binary32", side_attr_list()),
+#endif
+#if __HAVE_FLOAT64
+               side_field_float_binary64("binary64", side_attr_list()),
+#endif
+#if __HAVE_FLOAT128
+               side_field_float_binary128("binary128", side_attr_list()),
+#endif
+       ),
+       side_attr_list()
+);
+
+static
+void test_float(void)
+{
+       my_provider_event_float.enabled = 1;
+       side_event(&my_provider_event_float,
+               side_arg_list(
+#if __HAVE_FLOAT16
+                       side_arg_float_binary16(1.1),
+#endif
+#if __HAVE_FLOAT32
+                       side_arg_float_binary32(2.2),
+#endif
+#if __HAVE_FLOAT64
+                       side_arg_float_binary64(3.3),
+#endif
+#if __HAVE_FLOAT128
+                       side_arg_float_binary128(4.4),
+#endif
+               )
+       );
+}
+
+static side_define_event_variadic(my_provider_event_variadic_float,
+       "myprovider", "myvariadicfloat", SIDE_LOGLEVEL_DEBUG,
+       side_field_list(),
+       side_attr_list()
+);
+
+static
+void test_variadic_float(void)
+{
+       my_provider_event_variadic_float.enabled = 1;
+       side_event_variadic(&my_provider_event_variadic_float,
+               side_arg_list(),
+               side_arg_list(
+#if __HAVE_FLOAT16
+                       side_arg_dynamic_field("binary16",
+                               side_arg_dynamic_float_binary16(1.1, side_attr_list())
+                       ),
+#endif
+#if __HAVE_FLOAT32
+                       side_arg_dynamic_field("binary32",
+                               side_arg_dynamic_float_binary32(2.2, side_attr_list())
+                       ),
+#endif
+#if __HAVE_FLOAT64
+                       side_arg_dynamic_field("binary64",
+                               side_arg_dynamic_float_binary64(3.3, side_attr_list())
+                       ),
+#endif
+#if __HAVE_FLOAT128
+                       side_arg_dynamic_field("binary128",
+                               side_arg_dynamic_float_binary128(4.4, side_attr_list())
+                       ),
+#endif
+               )
+       );
+}
+
+static side_define_enum(myenum,
+       side_enum_mapping_list(
+               side_enum_mapping_range("one-ten", 1, 10),
+               side_enum_mapping_range("100-200", 100, 200),
+               side_enum_mapping_value("200", 200),
+               side_enum_mapping_value("300", 300),
+       )
+);
+
+static side_define_event(my_provider_event_enum, "myprovider", "myeventenum", SIDE_LOGLEVEL_DEBUG,
+       side_field_list(
+               side_field_enum_u32("5", &myenum, side_attr_list()),
+               side_field_enum_u64("400", &myenum, side_attr_list()),
+               side_field_enum_u8("200", &myenum, side_attr_list()),
+               side_field_enum_s8("-100", &myenum, side_attr_list()),
+       ),
+       side_attr_list()
+);
+
+static
+void test_enum(void)
+{
+       my_provider_event_enum.enabled = 1;
+       side_event(&my_provider_event_enum,
+               side_arg_list(
+                       side_arg_enum_u32(5),
+                       side_arg_enum_u64(400),
+                       side_arg_enum_u8(200),
+                       side_arg_enum_s8(-100),
+               )
+       );
+}
+
+/* A bitmap enum maps bits to labels. */
+static side_define_enum_bitmap(myenum_bitmap,
+       side_enum_bitmap_mapping_list(
+               side_enum_bitmap_mapping_value("0", 0),
+               side_enum_bitmap_mapping_range("1-2", 1, 2),
+               side_enum_bitmap_mapping_range("2-4", 2, 4),
+               side_enum_bitmap_mapping_value("3", 3),
+               side_enum_bitmap_mapping_value("30", 30),
+               side_enum_bitmap_mapping_value("63", 63),
+       )
+);
+
+static side_define_event(my_provider_event_enum_bitmap, "myprovider", "myeventenumbitmap", SIDE_LOGLEVEL_DEBUG,
+       side_field_list(
+               side_field_enum_bitmap32("bit_0", &myenum_bitmap, side_attr_list()),
+               side_field_enum_bitmap32("bit_1", &myenum_bitmap, side_attr_list()),
+               side_field_enum_bitmap8("bit_2", &myenum_bitmap, side_attr_list()),
+               side_field_enum_bitmap8("bit_3", &myenum_bitmap, side_attr_list()),
+               side_field_enum_bitmap32("bit_30", &myenum_bitmap, side_attr_list()),
+               side_field_enum_bitmap32("bit_31", &myenum_bitmap, side_attr_list()),
+               side_field_enum_bitmap64("bit_63", &myenum_bitmap, side_attr_list()),
+               side_field_enum_bitmap64("bits_1+63", &myenum_bitmap, side_attr_list()),
+       ),
+       side_attr_list()
+);
+
+static
+void test_enum_bitmap(void)
+{
+       my_provider_event_enum_bitmap.enabled = 1;
+       side_event(&my_provider_event_enum_bitmap,
+               side_arg_list(
+                       side_arg_enum_bitmap32(1 << 0),
+                       side_arg_enum_bitmap32(1 << 1),
+                       side_arg_enum_bitmap8(1 << 2),
+                       side_arg_enum_bitmap8(1 << 3),
+                       side_arg_enum_bitmap32(1 << 30),
+                       side_arg_enum_bitmap32(1 << 31),
+                       side_arg_enum_bitmap64(1ULL << 63),
+                       side_arg_enum_bitmap64((1ULL << 1) | (1ULL << 63)),
+               )
+       );
+}
+
+
 int main()
 {
        test_fields();
@@ -731,5 +1026,13 @@ int main()
        test_dynamic_vla_with_visitor();
        test_dynamic_struct_with_visitor();
        test_event_user_attribute();
+       test_field_user_attribute();
+       test_variadic_attr();
+       test_variadic_vla_attr();
+       test_variadic_struct_attr();
+       test_float();
+       test_variadic_float();
+       test_enum();
+       test_enum_bitmap();
        return 0;
 }
This page took 0.035199 seconds and 4 git commands to generate.