trace.h: Cleanup: Add missing () around macro parameter

[libside.git] / include / side / trace.h

diff --git a/include/side/trace.h b/include/side/trace.h
index 42efeefda9803ca5a474a89ba576b736c268767f..fad7c2bf233b1148e91f2663454232a2dd9e44bb 100644 (file)
--- a/include/side/trace.h
+++ b/include/side/trace.h
@@ -84,6 +84,7 @@ struct side_event_description;
 struct side_arg_dynamic_struct;
 struct side_events_register_handle;
 struct side_arg_variant;
+struct side_event_state;
 
 enum side_type_label {
        /* Stack-copy basic types */
@@ -651,16 +652,6 @@ struct side_tracer_dynamic_struct_visitor_ctx {
        void *priv;             /* Private tracer context. */
 } SIDE_PACKED;
 
-/*
- * This structure is _not_ packed to allow atomic operations on its
- * fields.
- */
-struct side_event_state {
-       uintptr_t enabled;
-       const struct side_callback *callbacks;
-       uint32_t nr_callbacks;
-};
-
 struct side_event_description {
        side_ptr_t(struct side_event_state) state;
        side_ptr_t(const char) provider_name;
@@ -672,8 +663,19 @@ struct side_event_description {
        side_enum_t(enum side_loglevel, uint32_t) loglevel;
        uint32_t nr_fields;
        uint32_t nr_attr;
+       uint32_t nr_callbacks;
 } SIDE_PACKED;
 
+/*
+ * This structure is _not_ packed to allow atomic operations on its
+ * fields.
+ */
+struct side_event_state {
+       uintptr_t enabled;
+       const struct side_callback *callbacks;
+       struct side_event_description *desc;
+};
+
 /* Event and type attributes */
 
 #define side_attr(_key, _value)        \
@@ -1775,7 +1777,7 @@ struct side_event_description {
                        .sav = SIDE_PTR_INIT(side_sav), \
                        .len = SIDE_ARRAY_SIZE(side_sav), \
                }; \
-               side_call(&(_identifier), &side_arg_vec); \
+               side_call(&(side_event_state__##_identifier), &side_arg_vec); \
        }
 
 #define side_event(_identifier, _sav) \
@@ -1796,7 +1798,7 @@ struct side_event_description {
                        .len = SIDE_ARRAY_SIZE(side_fields), \
                        .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
                }; \
-               side_call_variadic(&(_identifier), &side_arg_vec, &var_struct); \
+               side_call_variadic(&(side_event_state__##_identifier), &side_arg_vec, &var_struct); \
        }
 
 #define side_event_variadic(_identifier, _sav, _var, _attr...) \
@@ -1804,11 +1806,13 @@ struct side_event_description {
                side_event_call_variadic(_identifier, SIDE_PARAM(_sav), SIDE_PARAM(_var), SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list()))
 
 #define _side_define_event(_linkage, _identifier, _provider, _event, _loglevel, _fields, _flags, _attr...) \
+       _linkage struct side_event_description __attribute__((section("side_event_description"))) \
+                       _identifier; \
        _linkage struct side_event_state __attribute__((section("side_event_state"))) \
                        side_event_state__##_identifier = { \
                .enabled = 0, \
                .callbacks = &side_empty_callback, \
-               .nr_callbacks = 0, \
+               .desc = &(_identifier), \
        }; \
        _linkage struct side_event_description __attribute__((section("side_event_description"))) \
                        _identifier = { \
@@ -1822,6 +1826,7 @@ struct side_event_description {
                .loglevel = SIDE_ENUM_INIT(_loglevel), \
                .nr_fields = SIDE_ARRAY_SIZE(SIDE_PARAM(_fields)), \
                .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM_SELECT_ARG1(_, ##_attr, side_attr_list())), \
+               .nr_callbacks = 0, \
        }; \
        static const struct side_event_description *side_event_ptr__##_identifier \
                __attribute__((section("side_event_description_ptr"), used)) = &(_identifier);
@@ -1860,9 +1865,9 @@ extern "C" {
 
 extern const struct side_callback side_empty_callback;
 
-void side_call(const struct side_event_description *desc,
+void side_call(const struct side_event_state *state,
        const struct side_arg_vec *side_arg_vec);
-void side_call_variadic(const struct side_event_description *desc,
+void side_call_variadic(const struct side_event_state *state,
        const struct side_arg_vec *side_arg_vec,
        const struct side_arg_dynamic_struct *var_struct);