Register events and use them from tracer event notification

[libside.git] / src / test.c

diff --git a/src/test.c b/src/test.c
index 7f9aabda15c2305da447624800f3465e4f933d54..ebd4bc904b82dee15b992b9caaa3ce6f9f3d123b 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -14,7 +14,7 @@
 
 /* User code example */
 
-static side_define_event(my_provider_event, "myprovider", "myevent", SIDE_LOGLEVEL_DEBUG,
+side_static_event(my_provider_event, "myprovider", "myevent", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_u32("abc", side_attr_list()),
                side_field_s64("def", side_attr_list()),
@@ -29,12 +29,39 @@ void test_fields(void)
        uint32_t uw = 42;
        int64_t sdw = -500;
 
-       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_attr_list()))));
 }
 
-static side_define_event(my_provider_event_struct_literal, "myprovider", "myeventstructliteral", SIDE_LOGLEVEL_DEBUG,
+side_hidden_event(my_provider_event_hidden, "myprovider", "myeventhidden", SIDE_LOGLEVEL_DEBUG,
+       side_field_list(
+               side_field_u32("abc", side_attr_list()),
+       ),
+       side_attr_list()
+);
+
+static
+void test_event_hidden(void)
+{
+       side_event(my_provider_event_hidden, side_arg_list(side_arg_u32(2)));
+}
+
+side_declare_event(my_provider_event_export);
+
+side_export_event(my_provider_event_export, "myprovider", "myeventexport", SIDE_LOGLEVEL_DEBUG,
+       side_field_list(
+               side_field_u32("abc", side_attr_list()),
+       ),
+       side_attr_list()
+);
+
+static
+void test_event_export(void)
+{
+       side_event(my_provider_event_export, side_arg_list(side_arg_u32(2)));
+}
+
+side_static_event(my_provider_event_struct_literal, "myprovider", "myeventstructliteral", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_struct("structliteral",
                        side_struct_literal(
@@ -53,7 +80,6 @@ static side_define_event(my_provider_event_struct_literal, "myprovider", "myeven
 static
 void test_struct_literal(void)
 {
-       my_provider_event_struct_literal_enabled = 1;
        side_event_cond(my_provider_event_struct_literal) {
                side_arg_define_vec(mystruct, side_arg_list(side_arg_u32(21), side_arg_s64(22)));
                side_event_call(my_provider_event_struct_literal, side_arg_list(side_arg_struct(&mystruct), side_arg_u8(55)));
@@ -68,7 +94,7 @@ static side_define_struct(mystructdef,
        side_attr_list()
 );
 
-static side_define_event(my_provider_event_struct, "myprovider", "myeventstruct", SIDE_LOGLEVEL_DEBUG,
+side_static_event(my_provider_event_struct, "myprovider", "myeventstruct", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_struct("struct", &mystructdef),
                side_field_u8("z", side_attr_list()),
@@ -79,14 +105,13 @@ static side_define_event(my_provider_event_struct, "myprovider", "myeventstruct"
 static
 void test_struct(void)
 {
-       my_provider_event_struct_enabled = 1;
        side_event_cond(my_provider_event_struct) {
                side_arg_define_vec(mystruct, side_arg_list(side_arg_u32(21), side_arg_s64(22)));
                side_event_call(my_provider_event_struct, side_arg_list(side_arg_struct(&mystruct), side_arg_u8(55)));
        }
 }
 
-static side_define_event(my_provider_event_array, "myprovider", "myarray", SIDE_LOGLEVEL_DEBUG,
+side_static_event(my_provider_event_array, "myprovider", "myarray", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_array("arr", side_elem(side_type_u32(side_attr_list())), 3, side_attr_list()),
                side_field_s64("v", side_attr_list()),
@@ -97,14 +122,13 @@ static side_define_event(my_provider_event_array, "myprovider", "myarray", SIDE_
 static
 void test_array(void)
 {
-       my_provider_event_array_enabled = 1;
        side_event_cond(my_provider_event_array) {
                side_arg_define_vec(myarray, side_arg_list(side_arg_u32(1), side_arg_u32(2), side_arg_u32(3)));
                side_event_call(my_provider_event_array, side_arg_list(side_arg_array(&myarray), side_arg_s64(42)));
        }
 }
 
-static side_define_event(my_provider_event_vla, "myprovider", "myvla", SIDE_LOGLEVEL_DEBUG,
+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_attr_list())), side_attr_list()),
                side_field_s64("v", side_attr_list()),
@@ -115,7 +139,6 @@ static side_define_event(my_provider_event_vla, "myprovider", "myvla", SIDE_LOGL
 static
 void test_vla(void)
 {
-       my_provider_event_vla_enabled = 1;
        side_event_cond(my_provider_event_vla) {
                side_arg_define_vec(myvla, side_arg_list(side_arg_u32(1), side_arg_u32(2), side_arg_u32(3)));
                side_event_call(my_provider_event_vla, side_arg_list(side_arg_vla(&myvla), side_arg_s64(42)));
@@ -146,7 +169,7 @@ enum side_visitor_status test_visitor(const struct side_tracer_visitor_ctx *trac
 
 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_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(side_attr_list())), test_visitor, side_attr_list()),
                side_field_s64("v", side_attr_list()),
@@ -157,7 +180,6 @@ static side_define_event(my_provider_event_vla_visitor, "myprovider", "myvlavisi
 static
 void test_vla_visitor(void)
 {
-       my_provider_event_vla_visitor_enabled = 1;
        side_event_cond(my_provider_event_vla_visitor) {
                struct app_visitor_ctx ctx = {
                        .ptr = testarray,
@@ -218,7 +240,7 @@ static uint32_t testarray2d[][2] = {
        { 55, 66 },
 };
 
-static side_define_event(my_provider_event_vla_visitor2d, "myprovider", "myvlavisit2d", SIDE_LOGLEVEL_DEBUG,
+side_static_event(my_provider_event_vla_visitor2d, "myprovider", "myvlavisit2d", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_vla_visitor("vlavisit2d",
                        side_elem(
@@ -235,7 +257,6 @@ static side_define_event(my_provider_event_vla_visitor2d, "myprovider", "myvlavi
 static
 void test_vla_visitor_2d(void)
 {
-       my_provider_event_vla_visitor2d_enabled = 1;
        side_event_cond(my_provider_event_vla_visitor2d) {
                struct app_visitor_2d_outer_ctx ctx = {
                        .ptr = testarray2d,
@@ -247,7 +268,7 @@ void test_vla_visitor_2d(void)
 
 static int64_t array_fixint[] = { -444, 555, 123, 2897432587 };
 
-static side_define_event(my_provider_event_array_fixint, "myprovider", "myarrayfixint", SIDE_LOGLEVEL_DEBUG,
+side_static_event(my_provider_event_array_fixint, "myprovider", "myarrayfixint", SIDE_LOGLEVEL_DEBUG,
        side_field_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()),
@@ -258,14 +279,13 @@ static side_define_event(my_provider_event_array_fixint, "myprovider", "myarrayf
 static
 void test_array_fixint(void)
 {
-       my_provider_event_array_fixint_enabled = 1;
        side_event(my_provider_event_array_fixint,
                side_arg_list(side_arg_array_s64(array_fixint), side_arg_s64(42)));
 }
 
 static int64_t vla_fixint[] = { -444, 555, 123, 2897432587 };
 
-static side_define_event(my_provider_event_vla_fixint, "myprovider", "myvlafixint", SIDE_LOGLEVEL_DEBUG,
+side_static_event(my_provider_event_vla_fixint, "myprovider", "myvlafixint", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_vla("vlafixint", side_elem(side_type_s64(side_attr_list())), side_attr_list()),
                side_field_s64("v", side_attr_list()),
@@ -276,12 +296,11 @@ static side_define_event(my_provider_event_vla_fixint, "myprovider", "myvlafixin
 static
 void test_vla_fixint(void)
 {
-       my_provider_event_vla_fixint_enabled = 1;
        side_event(my_provider_event_vla_fixint,
                side_arg_list(side_arg_vla_s64(vla_fixint, SIDE_ARRAY_SIZE(vla_fixint)), side_arg_s64(42)));
 }
 
-static side_define_event(my_provider_event_dynamic_basic,
+side_static_event(my_provider_event_dynamic_basic,
        "myprovider", "mydynamicbasic", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_dynamic("dynamic", side_attr_list()),
@@ -292,12 +311,11 @@ static side_define_event(my_provider_event_dynamic_basic,
 static
 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_attr_list()))));
 }
 
-static side_define_event(my_provider_event_dynamic_vla,
+side_static_event(my_provider_event_dynamic_vla,
        "myprovider", "mydynamicvla", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_dynamic("dynamic", side_attr_list()),
@@ -316,12 +334,11 @@ void test_dynamic_vla(void)
                ),
                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))));
 }
 
-static side_define_event(my_provider_event_dynamic_null,
+side_static_event(my_provider_event_dynamic_null,
        "myprovider", "mydynamicnull", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_dynamic("dynamic", side_attr_list()),
@@ -332,12 +349,11 @@ static side_define_event(my_provider_event_dynamic_null,
 static
 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_attr_list()))));
 }
 
-static side_define_event(my_provider_event_dynamic_struct,
+side_static_event(my_provider_event_dynamic_struct,
        "myprovider", "mydynamicstruct", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_dynamic("dynamic", side_attr_list()),
@@ -357,12 +373,11 @@ void test_dynamic_struct(void)
                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))));
 }
 
-static side_define_event(my_provider_event_dynamic_nested_struct,
+side_static_event(my_provider_event_dynamic_nested_struct,
        "myprovider", "mydynamicnestedstruct", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_dynamic("dynamic", side_attr_list()),
@@ -394,12 +409,11 @@ void test_dynamic_nested_struct(void)
                ),
                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))));
 }
 
-static side_define_event(my_provider_event_dynamic_vla_struct,
+side_static_event(my_provider_event_dynamic_vla_struct,
        "myprovider", "mydynamicvlastruct", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_dynamic("dynamic", side_attr_list()),
@@ -426,12 +440,11 @@ void test_dynamic_vla_struct(void)
                ),
                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))));
 }
 
-static side_define_event(my_provider_event_dynamic_struct_vla,
+side_static_event(my_provider_event_dynamic_struct_vla,
        "myprovider", "mydynamicstructvla", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_dynamic("dynamic", side_attr_list()),
@@ -465,12 +478,11 @@ void test_dynamic_struct_vla(void)
                ),
                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))));
 }
 
-static side_define_event(my_provider_event_dynamic_nested_vla,
+side_static_event(my_provider_event_dynamic_nested_vla,
        "myprovider", "mydynamicnestedvla", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_dynamic("dynamic", side_attr_list()),
@@ -504,12 +516,11 @@ void test_dynamic_nested_vla(void)
                ),
                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))));
 }
 
-static side_define_event_variadic(my_provider_event_variadic,
+side_static_event_variadic(my_provider_event_variadic,
        "myprovider", "myvariadicevent", SIDE_LOGLEVEL_DEBUG,
        side_field_list(),
        side_attr_list()
@@ -518,7 +529,6 @@ static side_define_event_variadic(my_provider_event_variadic,
 static
 void test_variadic(void)
 {
-       my_provider_event_variadic_enabled = 1;
        side_event_variadic(my_provider_event_variadic,
                side_arg_list(),
                side_arg_list(
@@ -529,7 +539,7 @@ void test_variadic(void)
        );
 }
 
-static side_define_event_variadic(my_provider_event_static_variadic,
+side_static_event_variadic(my_provider_event_static_variadic,
        "myprovider", "mystaticvariadicevent", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_u32("abc", side_attr_list()),
@@ -541,7 +551,6 @@ static side_define_event_variadic(my_provider_event_static_variadic,
 static
 void test_static_variadic(void)
 {
-       my_provider_event_static_variadic_enabled = 1;
        side_event_variadic(my_provider_event_static_variadic,
                side_arg_list(
                        side_arg_u32(1),
@@ -555,7 +564,7 @@ void test_static_variadic(void)
        );
 }
 
-static side_define_event(my_provider_event_bool, "myprovider", "myeventbool", SIDE_LOGLEVEL_DEBUG,
+side_static_event(my_provider_event_bool, "myprovider", "myeventbool", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_bool("a_false", side_attr_list()),
                side_field_bool("b_true", side_attr_list()),
@@ -579,7 +588,6 @@ void test_bool(void)
        bool f = false;
        uint32_t g = 256;
 
-       my_provider_event_bool_enabled = 1;
        side_event(my_provider_event_bool,
                side_arg_list(
                        side_arg_bool(a),
@@ -593,7 +601,7 @@ void test_bool(void)
        );
 }
 
-static side_define_event_variadic(my_provider_event_dynamic_bool,
+side_static_event_variadic(my_provider_event_dynamic_bool,
        "myprovider", "mydynamicbool", SIDE_LOGLEVEL_DEBUG,
        side_field_list(),
        side_attr_list()
@@ -602,7 +610,6 @@ static side_define_event_variadic(my_provider_event_dynamic_bool,
 static
 void test_dynamic_bool(void)
 {
-       my_provider_event_dynamic_bool_enabled = 1;
        side_event_variadic(my_provider_event_dynamic_bool,
                side_arg_list(),
                side_arg_list(
@@ -615,7 +622,7 @@ void test_dynamic_bool(void)
        );
 }
 
-static side_define_event(my_provider_event_dynamic_vla_visitor,
+side_static_event(my_provider_event_dynamic_vla_visitor,
        "myprovider", "mydynamicvlavisitor", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_dynamic("dynamic", side_attr_list()),
@@ -658,7 +665,6 @@ static uint32_t testarray_dynamic_vla[] = { 1, 2, 3, 4, 5, 6, 7, 8 };
 static
 void test_dynamic_vla_with_visitor(void)
 {
-       my_provider_event_dynamic_vla_visitor_enabled = 1;
        side_event_cond(my_provider_event_dynamic_vla_visitor) {
                struct app_dynamic_vla_visitor_ctx ctx = {
                        .ptr = testarray_dynamic_vla,
@@ -674,7 +680,7 @@ void test_dynamic_vla_with_visitor(void)
        }
 }
 
-static side_define_event(my_provider_event_dynamic_struct_visitor,
+side_static_event(my_provider_event_dynamic_struct_visitor,
        "myprovider", "mydynamicstructvisitor", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_dynamic("dynamic", side_attr_list()),
@@ -730,7 +736,6 @@ static struct struct_visitor_pair testarray_dynamic_struct[] = {
 static
 void test_dynamic_struct_with_visitor(void)
 {
-       my_provider_event_dynamic_struct_visitor_enabled = 1;
        side_event_cond(my_provider_event_dynamic_struct_visitor) {
                struct app_dynamic_struct_visitor_ctx ctx = {
                        .ptr = testarray_dynamic_struct,
@@ -746,7 +751,7 @@ void test_dynamic_struct_with_visitor(void)
        }
 }
 
-static side_define_event(my_provider_event_user_attribute, "myprovider", "myevent_user_attribute", SIDE_LOGLEVEL_DEBUG,
+side_static_event(my_provider_event_user_attribute, "myprovider", "myevent_user_attribute", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_u32("abc", side_attr_list()),
                side_field_s64("def", side_attr_list()),
@@ -760,11 +765,10 @@ static side_define_event(my_provider_event_user_attribute, "myprovider", "myeven
 static
 void test_event_user_attribute(void)
 {
-       my_provider_event_user_attribute_enabled = 1;
        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_static_event(my_provider_field_user_attribute, "myprovider", "myevent_field_attribute", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_u32("abc",
                        side_attr_list(
@@ -785,11 +789,10 @@ static side_define_event(my_provider_field_user_attribute, "myprovider", "myeven
 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,
+side_static_event_variadic(my_provider_event_variadic_attr,
        "myprovider", "myvariadiceventattr", SIDE_LOGLEVEL_DEBUG,
        side_field_list(),
        side_attr_list()
@@ -798,7 +801,6 @@ static side_define_event_variadic(my_provider_event_variadic_attr,
 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(
@@ -823,7 +825,7 @@ void test_variadic_attr(void)
        );
 }
 
-static side_define_event_variadic(my_provider_event_variadic_vla_attr,
+side_static_event_variadic(my_provider_event_variadic_vla_attr,
        "myprovider", "myvariadiceventvlaattr", SIDE_LOGLEVEL_DEBUG,
        side_field_list(),
        side_attr_list()
@@ -848,7 +850,6 @@ void test_variadic_vla_attr(void)
                        side_attr("Y", side_attr_u8(2)),
                )
        );
-       my_provider_event_variadic_vla_attr_enabled = 1;
        side_event_variadic(my_provider_event_variadic_vla_attr,
                side_arg_list(),
                side_arg_list(
@@ -858,7 +859,7 @@ void test_variadic_vla_attr(void)
        );
 }
 
-static side_define_event_variadic(my_provider_event_variadic_struct_attr,
+side_static_event_variadic(my_provider_event_variadic_struct_attr,
        "myprovider", "myvariadiceventstructattr", SIDE_LOGLEVEL_DEBUG,
        side_field_list(),
        side_attr_list()
@@ -867,7 +868,6 @@ static side_define_event_variadic(my_provider_event_variadic_struct_attr,
 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(
@@ -895,7 +895,7 @@ void test_variadic_struct_attr(void)
        }
 }
 
-static side_define_event(my_provider_event_float, "myprovider", "myeventfloat", SIDE_LOGLEVEL_DEBUG,
+side_static_event(my_provider_event_float, "myprovider", "myeventfloat", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
 #if __HAVE_FLOAT16
                side_field_float_binary16("binary16", side_attr_list()),
@@ -916,7 +916,6 @@ static side_define_event(my_provider_event_float, "myprovider", "myeventfloat",
 static
 void test_float(void)
 {
-       my_provider_event_float_enabled = 1;
        side_event(my_provider_event_float,
                side_arg_list(
 #if __HAVE_FLOAT16
@@ -935,7 +934,7 @@ void test_float(void)
        );
 }
 
-static side_define_event_variadic(my_provider_event_variadic_float,
+side_static_event_variadic(my_provider_event_variadic_float,
        "myprovider", "myvariadicfloat", SIDE_LOGLEVEL_DEBUG,
        side_field_list(),
        side_attr_list()
@@ -944,7 +943,6 @@ static side_define_event_variadic(my_provider_event_variadic_float,
 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(
@@ -983,12 +981,12 @@ static side_define_enum(myenum,
        side_attr_list()
 );
 
-static side_define_event(my_provider_event_enum, "myprovider", "myeventenum", SIDE_LOGLEVEL_DEBUG,
+side_static_event(my_provider_event_enum, "myprovider", "myeventenum", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field_enum("5", side_elem(side_type_u32(side_attr_list())), &myenum),
-               side_field_enum("400", side_elem(side_type_u64(side_attr_list())), &myenum),
-               side_field_enum("200", side_elem(side_type_u8(side_attr_list())), &myenum),
-               side_field_enum("-100", side_elem(side_type_s8(side_attr_list())), &myenum),
+               side_field_enum("5", &myenum, side_elem(side_type_u32(side_attr_list()))),
+               side_field_enum("400", &myenum, side_elem(side_type_u64(side_attr_list()))),
+               side_field_enum("200", &myenum, side_elem(side_type_u8(side_attr_list()))),
+               side_field_enum("-100", &myenum, side_elem(side_type_s8(side_attr_list()))),
        ),
        side_attr_list()
 );
@@ -996,7 +994,6 @@ static side_define_event(my_provider_event_enum, "myprovider", "myeventenum", SI
 static
 void test_enum(void)
 {
-       my_provider_event_enum_enabled = 1;
        side_event(my_provider_event_enum,
                side_arg_list(
                        side_arg_u32(5),
@@ -1023,20 +1020,21 @@ static side_define_enum_bitmap(myenum_bitmap,
        side_attr_list()
 );
 
-static side_define_event(my_provider_event_enum_bitmap, "myprovider", "myeventenumbitmap", SIDE_LOGLEVEL_DEBUG,
+side_static_event(my_provider_event_enum_bitmap, "myprovider", "myeventenumbitmap", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field_enum_bitmap32("bit_0", &myenum_bitmap),
-               side_field_enum_bitmap32("bit_1", &myenum_bitmap),
-               side_field_enum_bitmap8("bit_2", &myenum_bitmap),
-               side_field_enum_bitmap8("bit_3", &myenum_bitmap),
-               side_field_enum_bitmap32("bit_30", &myenum_bitmap),
-               side_field_enum_bitmap32("bit_31", &myenum_bitmap),
-               side_field_enum_bitmap64("bit_63", &myenum_bitmap),
-               side_field_enum_bitmap64("bits_1+63", &myenum_bitmap),
-               side_field_enum_bitmap_array("bit_159", &myenum_bitmap,
-                       side_elem(side_type_u32(side_attr_list())), 5),
-               side_field_enum_bitmap_vla("bit_159", &myenum_bitmap,
-                       side_elem(side_type_u32(side_attr_list()))),
+               side_field_enum_bitmap("bit_0", &myenum_bitmap, side_elem(side_type_u32(side_attr_list()))),
+               side_field_enum_bitmap("bit_1", &myenum_bitmap, side_elem(side_type_u32(side_attr_list()))),
+               side_field_enum_bitmap("bit_2", &myenum_bitmap, side_elem(side_type_u8(side_attr_list()))),
+               side_field_enum_bitmap("bit_3", &myenum_bitmap, side_elem(side_type_u8(side_attr_list()))),
+               side_field_enum_bitmap("bit_30", &myenum_bitmap, side_elem(side_type_u32(side_attr_list()))),
+               side_field_enum_bitmap("bit_31", &myenum_bitmap, side_elem(side_type_u32(side_attr_list()))),
+               side_field_enum_bitmap("bit_63", &myenum_bitmap, side_elem(side_type_u64(side_attr_list()))),
+               side_field_enum_bitmap("bits_1+63", &myenum_bitmap, side_elem(side_type_u64(side_attr_list()))),
+               side_field_enum_bitmap("byte_bit_2", &myenum_bitmap, side_elem(side_type_byte(side_attr_list()))),
+               side_field_enum_bitmap("bit_159", &myenum_bitmap,
+                       side_elem(side_type_array(side_elem(side_type_u32(side_attr_list())), 5, side_attr_list()))),
+               side_field_enum_bitmap("bit_159", &myenum_bitmap,
+                       side_elem(side_type_vla(side_elem(side_type_u32(side_attr_list())), side_attr_list()))),
        ),
        side_attr_list()
 );
@@ -1044,7 +1042,6 @@ static side_define_event(my_provider_event_enum_bitmap, "myprovider", "myeventen
 static
 void test_enum_bitmap(void)
 {
-       my_provider_event_enum_bitmap_enabled = 1;
        side_event_cond(my_provider_event_enum_bitmap) {
                side_arg_define_vec(myarray,
                        side_arg_list(
@@ -1057,16 +1054,17 @@ void test_enum_bitmap(void)
                );
                side_event_call(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)),
-                               side_arg_enum_bitmap_array(&myarray),
-                               side_arg_enum_bitmap_vla(&myarray),
+                               side_arg_u32(1 << 0),
+                               side_arg_u32(1 << 1),
+                               side_arg_u8(1 << 2),
+                               side_arg_u8(1 << 3),
+                               side_arg_u32(1 << 30),
+                               side_arg_u32(1 << 31),
+                               side_arg_u64(1ULL << 63),
+                               side_arg_u64((1ULL << 1) | (1ULL << 63)),
+                               side_arg_byte(1 << 2),
+                               side_arg_array(&myarray),
+                               side_arg_vla(&myarray),
                        )
                );
        }
@@ -1074,12 +1072,12 @@ void test_enum_bitmap(void)
 
 static uint8_t blob_fixint[] = { 0x55, 0x44, 0x33, 0x22, 0x11 };
 
-static side_define_event_variadic(my_provider_event_blob, "myprovider", "myeventblob", SIDE_LOGLEVEL_DEBUG,
+side_static_event_variadic(my_provider_event_blob, "myprovider", "myeventblob", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field_blob("blobfield", side_attr_list()),
-               side_field_array("arrayblob", side_elem(side_type_blob(side_attr_list())), 3, side_attr_list()),
-               side_field_array("arrayblobfix", side_elem(side_type_blob(side_attr_list())), SIDE_ARRAY_SIZE(blob_fixint), side_attr_list()),
-               side_field_vla("vlablobfix", side_elem(side_type_blob(side_attr_list())), side_attr_list()),
+               side_field_byte("blobfield", side_attr_list()),
+               side_field_array("arrayblob", side_elem(side_type_byte(side_attr_list())), 3, side_attr_list()),
+               side_field_array("arrayblobfix", side_elem(side_type_byte(side_attr_list())), SIDE_ARRAY_SIZE(blob_fixint), side_attr_list()),
+               side_field_vla("vlablobfix", side_elem(side_type_byte(side_attr_list())), side_attr_list()),
        ),
        side_attr_list()
 );
@@ -1087,26 +1085,25 @@ static side_define_event_variadic(my_provider_event_blob, "myprovider", "myevent
 static
 void test_blob(void)
 {
-       my_provider_event_blob_enabled = 1;
        side_event_cond(my_provider_event_blob) {
-               side_arg_define_vec(myarray, side_arg_list(side_arg_blob(1), side_arg_blob(2), side_arg_blob(3)));
+               side_arg_define_vec(myarray, side_arg_list(side_arg_byte(1), side_arg_byte(2), side_arg_byte(3)));
                side_arg_dynamic_define_vec(myvla,
                        side_arg_list(
-                               side_arg_dynamic_blob(0x22, side_attr_list()),
-                               side_arg_dynamic_blob(0x33, side_attr_list()),
+                               side_arg_dynamic_byte(0x22, side_attr_list()),
+                               side_arg_dynamic_byte(0x33, side_attr_list()),
                        ),
                        side_attr_list()
                );
                side_event_call_variadic(my_provider_event_blob,
                        side_arg_list(
-                               side_arg_blob(0x55),
+                               side_arg_byte(0x55),
                                side_arg_array(&myarray),
-                               side_arg_array_blob(blob_fixint),
-                               side_arg_vla_blob(blob_fixint, SIDE_ARRAY_SIZE(blob_fixint)),
+                               side_arg_array_byte(blob_fixint),
+                               side_arg_vla_byte(blob_fixint, SIDE_ARRAY_SIZE(blob_fixint)),
                        ),
                        side_arg_list(
                                side_arg_dynamic_field("varblobfield",
-                                       side_arg_dynamic_blob(0x55, side_attr_list())
+                                       side_arg_dynamic_byte(0x55, side_attr_list())
                                ),
                                side_arg_dynamic_field("varblobvla", side_arg_dynamic_vla(&myvla)),
                        ),
@@ -1115,7 +1112,7 @@ void test_blob(void)
        }
 }
 
-static side_define_event_variadic(my_provider_event_format_string,
+side_static_event_variadic(my_provider_event_format_string,
        "myprovider", "myeventformatstring", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
                side_field_string("fmt", side_attr_list()),
@@ -1128,7 +1125,6 @@ static side_define_event_variadic(my_provider_event_format_string,
 static
 void test_fmt_string(void)
 {
-       my_provider_event_format_string_enabled = 1;
        side_event_cond(my_provider_event_format_string) {
                side_arg_dynamic_define_vec(args,
                        side_arg_list(
@@ -1152,6 +1148,8 @@ void test_fmt_string(void)
 int main()
 {
        test_fields();
+       test_event_hidden();
+       test_event_export();
        test_struct_literal();
        test_struct();
        test_array();