From 9a55f555c3a6aa9b82ad66428be555a2dc069ba1 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 21 Oct 2022 11:25:25 -0400 Subject: [PATCH] Remove specific side_elem_* macros Can now use side_type_*() macros within side_elem(). Signed-off-by: Mathieu Desnoyers --- include/side/trace.h | 16 ---------------- src/test.c | 12 ++++++------ 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/include/side/trace.h b/include/side/trace.h index 046d7c0..07973e3 100644 --- a/include/side/trace.h +++ b/include/side/trace.h @@ -581,22 +581,6 @@ struct side_tracer_dynamic_vla_visitor_ctx { #define side_elem(...) \ SIDE_COMPOUND_LITERAL(const struct side_type_description, __VA_ARGS__) -#define side_elem_bool(_attr) side_elem(side_type_bool(SIDE_PARAM(_attr))) -#define side_elem_u8(_attr) side_elem(side_type_u8(SIDE_PARAM(_attr))) -#define side_elem_u16(_attr) side_elem(side_type_u16(SIDE_PARAM(_attr))) -#define side_elem_u32(_attr) side_elem(side_type_u32(SIDE_PARAM(_attr))) -#define side_elem_u64(_attr) side_elem(side_type_u64(SIDE_PARAM(_attr))) -#define side_elem_s8(_attr) side_elem(side_type_s8(SIDE_PARAM(_attr))) -#define side_elem_s16(_attr) side_elem(side_type_s16(SIDE_PARAM(_attr))) -#define side_elem_s32(_attr) side_elem(side_type_s32(SIDE_PARAM(_attr))) -#define side_elem_s64(_attr) side_elem(side_type_s64(SIDE_PARAM(_attr))) -#define side_elem_float_binary16(_attr) side_elem(side_type_float_binary16(SIDE_PARAM(_attr))) -#define side_elem_float_binary32(_attr) side_elem(side_type_float_binary32(SIDE_PARAM(_attr))) -#define side_elem_float_binary64(_attr) side_elem(side_type_float_binary64(SIDE_PARAM(_attr))) -#define side_elem_float_binary128(_attr) side_elem(side_type_float_binary128(SIDE_PARAM(_attr))) -#define side_elem_string(_attr) side_elem(side_type_string(SIDE_PARAM(_attr))) -#define side_elem_dynamic(_attr) side_elem(side_type_dynamic(SIDE_PARAM(_attr))) - #define side_field_list(...) \ SIDE_COMPOUND_LITERAL(const struct side_event_field, __VA_ARGS__) diff --git a/src/test.c b/src/test.c index d6411e9..5c301c5 100644 --- a/src/test.c +++ b/src/test.c @@ -60,7 +60,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_u32(side_attr_list()), 3, 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,7 +78,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_u32(side_attr_list()), 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() @@ -120,7 +120,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_u32(side_attr_list()), test_visitor, 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() @@ -195,7 +195,7 @@ static side_define_event(my_provider_event_vla_visitor2d, "myprovider", "myvlavi side_field_vla_visitor("vlavisit2d", side_elem( side_type_vla_visitor( - side_elem_u32(side_attr_list()), + side_elem(side_type_u32(side_attr_list())), test_inner_visitor, side_attr_list()) ), test_outer_visitor, side_attr_list()), @@ -221,7 +221,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_s64(side_attr_list()), SIDE_ARRAY_SIZE(array_fixint), 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() @@ -239,7 +239,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_s64(side_attr_list()), 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() -- 2.34.1