Reverse argument order for enum and enum bitmap

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

diff --git a/include/side/trace.h b/include/side/trace.h
index ff9a23e097e8f731a635a2eb8cd9c56742d1a1d0..a8df65d43b28704901f6e48e4645007e37bd7b90 100644 (file)
--- a/include/side/trace.h
+++ b/include/side/trace.h
@@ -250,12 +250,12 @@ struct side_type_description {
 
                /* Enumeration types */
                struct {
-                       const struct side_type_description *elem_type;
                        const struct side_enum_mappings *mappings;
+                       const struct side_type_description *elem_type;
                } side_enum;
                struct {
-                       const struct side_type_description *elem_type;
                        const struct side_enum_bitmap_mappings *mappings;
+                       const struct side_type_description *elem_type;
                } side_enum_bitmap;
        } u;
 };
@@ -523,31 +523,31 @@ struct side_tracer_dynamic_vla_visitor_ctx {
 #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(_elem_type, _mappings) \
+#define side_type_enum(_mappings, _elem_type) \
        { \
                .type = SIDE_TYPE_ENUM, \
                .u = { \
                        .side_enum = { \
-                               .elem_type = _elem_type, \
                                .mappings = _mappings, \
+                               .elem_type = _elem_type, \
                        }, \
                }, \
        }
-#define side_field_enum(_name, _elem_type, _mappings) \
-       _side_field(_name, side_type_enum(SIDE_PARAM(_elem_type), SIDE_PARAM(_mappings)))
+#define side_field_enum(_name, _mappings, _elem_type) \
+       _side_field(_name, side_type_enum(SIDE_PARAM(_mappings), SIDE_PARAM(_elem_type)))
 
-#define side_type_enum_bitmap(_elem_type, _mappings) \
+#define side_type_enum_bitmap(_mappings, _elem_type) \
        { \
                .type = SIDE_TYPE_ENUM_BITMAP, \
                .u = { \
                        .side_enum_bitmap = { \
-                               .elem_type = _elem_type, \
                                .mappings = _mappings, \
+                               .elem_type = _elem_type, \
                        }, \
                }, \
        }
-#define side_field_enum_bitmap(_name, _elem_type, _mappings) \
-       _side_field(_name, side_type_enum_bitmap(SIDE_PARAM(_elem_type), SIDE_PARAM(_mappings)))
+#define side_field_enum_bitmap(_name, _mappings, _elem_type) \
+       _side_field(_name, side_type_enum_bitmap(SIDE_PARAM(_mappings), SIDE_PARAM(_elem_type)))
 
 #define side_type_struct(_struct) \
        { \

diff --git a/src/test.c b/src/test.c
index d5b61cce68bc32c47d0e59f1683e0141d68723e8..396a3f0d5fa6da1fa5e3c089f947e1ccf03401e0 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -985,10 +985,10 @@ static side_define_enum(myenum,
 
 static side_define_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()
 );
@@ -1025,20 +1025,18 @@ static side_define_enum_bitmap(myenum_bitmap,
 
 static side_define_event(my_provider_event_enum_bitmap, "myprovider", "myeventenumbitmap", SIDE_LOGLEVEL_DEBUG,
        side_field_list(
-               side_field_enum_bitmap("bit_0", side_elem(side_type_u32(side_attr_list())), &myenum_bitmap),
-               side_field_enum_bitmap("bit_1", side_elem(side_type_u32(side_attr_list())), &myenum_bitmap),
-               side_field_enum_bitmap("bit_2", side_elem(side_type_u8(side_attr_list())), &myenum_bitmap),
-               side_field_enum_bitmap("bit_3", side_elem(side_type_u8(side_attr_list())), &myenum_bitmap),
-               side_field_enum_bitmap("bit_30", side_elem(side_type_u32(side_attr_list())), &myenum_bitmap),
-               side_field_enum_bitmap("bit_31", side_elem(side_type_u32(side_attr_list())), &myenum_bitmap),
-               side_field_enum_bitmap("bit_63", side_elem(side_type_u64(side_attr_list())), &myenum_bitmap),
-               side_field_enum_bitmap("bits_1+63", side_elem(side_type_u64(side_attr_list())), &myenum_bitmap),
-               side_field_enum_bitmap("bit_159",
-                       side_elem(side_type_array(side_elem(side_type_u32(side_attr_list())), 5, side_attr_list())),
-                       &myenum_bitmap),
-               side_field_enum_bitmap("bit_159",
-                       side_elem(side_type_vla(side_elem(side_type_u32(side_attr_list())), side_attr_list())),
-                       &myenum_bitmap),
+               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("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()
 );