Specialize side_field() macros

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/side/trace.h b/include/side/trace.h
index b1b34906b46acfaac76c8ee86ba09750527fc576..20dd4ac70d4f12e65b8e01f71c194ef78c79213d 100644 (file)
--- a/include/side/trace.h
+++ b/include/side/trace.h
@@ -415,12 +415,29 @@ struct side_tracer_dynamic_vla_visitor_ctx {
                .attr = _attr, \
        }
 
-#define side_field(_name, _type, _attr) \
+#define _side_field(_name, _type, _attr) \
        { \
                .field_name = _name, \
                .side_type = side_type_decl(_type, SIDE_PARAM(_attr)), \
        }
 
+#define side_field_bool(_name, _attr)                  _side_field(_name, SIDE_TYPE_BOOL, SIDE_PARAM(_attr))
+#define side_field_u8(_name, _attr)                    _side_field(_name, SIDE_TYPE_U8, SIDE_PARAM(_attr))
+#define side_field_u16(_name, _attr)                   _side_field(_name, SIDE_TYPE_U16, SIDE_PARAM(_attr))
+#define side_field_u32(_name, _attr)                   _side_field(_name, SIDE_TYPE_U32, SIDE_PARAM(_attr))
+#define side_field_u64(_name, _attr)                   _side_field(_name, SIDE_TYPE_U64, SIDE_PARAM(_attr))
+#define side_field_s8(_name, _attr)                    _side_field(_name, SIDE_TYPE_S8, SIDE_PARAM(_attr))
+#define side_field_s16(_name, _attr)                   _side_field(_name, SIDE_TYPE_S16, SIDE_PARAM(_attr))
+#define side_field_s32(_name, _attr)                   _side_field(_name, SIDE_TYPE_S32, SIDE_PARAM(_attr))
+#define side_field_s64(_name, _attr)                   _side_field(_name, SIDE_TYPE_S64, SIDE_PARAM(_attr))
+#define side_field_float_binary16(_name, _attr)                _side_field(_name, SIDE_TYPE_FLOAT_BINARY16, SIDE_PARAM(_attr))
+#define side_field_float_binary32(_name, _attr)                _side_field(_name, SIDE_TYPE_FLOAT_BINARY32, SIDE_PARAM(_attr))
+#define side_field_float_binary64(_name, _attr)                _side_field(_name, SIDE_TYPE_FLOAT_BINARY64, SIDE_PARAM(_attr))
+#define side_field_float_binary128(_name, _attr)       _side_field(_name, SIDE_TYPE_FLOAT_BINARY128, SIDE_PARAM(_attr))
+#define side_field_string(_name, _attr)                        _side_field(_name, SIDE_TYPE_STRING, SIDE_PARAM(_attr))
+
+#define side_field_dynamic(_name, _attr)               _side_field(_name, SIDE_TYPE_DYNAMIC, SIDE_PARAM(_attr))
+
 #define side_type_enum_decl(_type, _mappings, _attr) \
        { \
                .type = _type, \

diff --git a/src/test.c b/src/test.c
index 65db895e8fe2607ec30fe269a3849bca9c8c338e..b499004e13de27b54233b2939b1bc4f7aa14aaad 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -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()
 );
@@ -38,12 +38,12 @@ static side_define_event(my_provider_event2, "myprovider", "myevent2", SIDE_LOGL
        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()
 );
@@ -61,7 +61,7 @@ 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_s64("v", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -79,7 +79,7 @@ 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_s64("v", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -125,7 +125,7 @@ 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_s64("v", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -207,7 +207,7 @@ static side_define_event(my_provider_event_vla_visitor2d, "myprovider", "myvlavi
                                        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()
 );
@@ -230,7 +230,7 @@ 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_s64("v", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -248,7 +248,7 @@ 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_s64("v", side_attr_list()),
        ),
        side_attr_list()
 );
@@ -264,7 +264,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()
 );
@@ -280,7 +280,7 @@ void test_dynamic_basic_type(void)
 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()
 );
@@ -303,7 +303,7 @@ void test_dynamic_vla(void)
 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()
 );
@@ -319,7 +319,7 @@ void test_dynamic_null(void)
 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()
 );
@@ -343,7 +343,7 @@ void test_dynamic_struct(void)
 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()
 );
@@ -377,7 +377,7 @@ void test_dynamic_nested_struct(void)
 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()
 );
@@ -407,7 +407,7 @@ void test_dynamic_vla_struct(void)
 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()
 );
@@ -443,7 +443,7 @@ void test_dynamic_struct_vla(void)
 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()
 );
@@ -498,8 +498,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()
 );
@@ -522,13 +522,13 @@ void test_static_variadic(void)
 
 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()
 );
@@ -582,7 +582,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()
 );
@@ -637,7 +637,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()
 );
@@ -704,8 +704,8 @@ void test_dynamic_struct_with_visitor(void)
 
 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", side_attr_string("val1")),
@@ -722,13 +722,13 @@ void test_event_user_attribute(void)
 
 static side_define_event(my_provider_field_user_attribute, "myprovider", "myevent_field_attribute", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field("abc", SIDE_TYPE_U32,
+               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("def", SIDE_TYPE_S64,
+               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)),
@@ -857,16 +857,16 @@ void test_variadic_struct_attr(void)
 static side_define_event(my_provider_event_float, "myprovider", "myeventfloat", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
 #if __HAVE_FLOAT16
-               side_field("binary16", SIDE_TYPE_FLOAT_BINARY16, side_attr_list()),
+               side_field_float_binary16("binary16", side_attr_list()),
 #endif
 #if __HAVE_FLOAT32
-               side_field("binary32", SIDE_TYPE_FLOAT_BINARY32, side_attr_list()),
+               side_field_float_binary32("binary32", side_attr_list()),
 #endif
 #if __HAVE_FLOAT64
-               side_field("binary64", SIDE_TYPE_FLOAT_BINARY64, side_attr_list()),
+               side_field_float_binary64("binary64", side_attr_list()),
 #endif
 #if __HAVE_FLOAT128
-               side_field("binary128", SIDE_TYPE_FLOAT_BINARY128, side_attr_list()),
+               side_field_float_binary128("binary128", side_attr_list()),
 #endif
        ),
        side_attr_list()