Rename sav_desc to side_arg_vec

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

diff --git a/include/side/trace.h b/include/side/trace.h
index cd41dfbbf1d115e0fdf688a6d54615832ade92da..a12cdffbbdda72ea31a0852d2c64247ff25f9e9f 100644 (file)
--- a/include/side/trace.h
+++ b/include/side/trace.h
@@ -391,10 +391,10 @@ enum side_event_flags {
 struct side_callback {
        union {
                void (*call)(const struct side_event_description *desc,
-                       const struct side_arg_vec *sav_desc,
+                       const struct side_arg_vec *side_arg_vec,
                        void *priv);
                void (*call_variadic)(const struct side_event_description *desc,
-                       const struct side_arg_vec *sav_desc,
+                       const struct side_arg_vec *side_arg_vec,
                        const struct side_arg_dynamic_event_struct *var_struct,
                        void *priv);
        } SIDE_PACKED u;
@@ -1306,11 +1306,11 @@ struct side_tracer_dynamic_vla_visitor_ctx {
 #define side_event_call(_identifier, _sav) \
        { \
                const struct side_arg side_sav[] = { _sav }; \
-               const struct side_arg_vec sav_desc = { \
+               const struct side_arg_vec side_arg_vec = { \
                        .sav = side_sav, \
                        .len = SIDE_ARRAY_SIZE(side_sav), \
                }; \
-               side_call(&(_identifier), &sav_desc); \
+               side_call(&(_identifier), &side_arg_vec); \
        }
 
 #define side_event(_identifier, _sav) \
@@ -1320,7 +1320,7 @@ struct side_tracer_dynamic_vla_visitor_ctx {
 #define side_event_call_variadic(_identifier, _sav, _var_fields, _attr) \
        { \
                const struct side_arg side_sav[] = { _sav }; \
-               const struct side_arg_vec sav_desc = { \
+               const struct side_arg_vec side_arg_vec = { \
                        .sav = side_sav, \
                        .len = SIDE_ARRAY_SIZE(side_sav), \
                }; \
@@ -1331,7 +1331,7 @@ struct side_tracer_dynamic_vla_visitor_ctx {
                        .len = SIDE_ARRAY_SIZE(side_fields), \
                        .nr_attr = SIDE_ARRAY_SIZE(SIDE_PARAM(_attr)), \
                }; \
-               side_call_variadic(&(_identifier), &sav_desc, &var_struct); \
+               side_call_variadic(&(_identifier), &side_arg_vec, &var_struct); \
        }
 
 #define side_event_variadic(_identifier, _sav, _var, _attr) \
@@ -1389,30 +1389,30 @@ struct side_tracer_dynamic_vla_visitor_ctx {
 extern const struct side_callback side_empty_callback;
 
 void side_call(const struct side_event_description *desc,
-       const struct side_arg_vec *sav_desc);
+       const struct side_arg_vec *side_arg_vec);
 void side_call_variadic(const struct side_event_description *desc,
-       const struct side_arg_vec *sav_desc,
+       const struct side_arg_vec *side_arg_vec,
        const struct side_arg_dynamic_event_struct *var_struct);
 
 int side_tracer_callback_register(struct side_event_description *desc,
                void (*call)(const struct side_event_description *desc,
-                       const struct side_arg_vec *sav_desc,
+                       const struct side_arg_vec *side_arg_vec,
                        void *priv),
                void *priv);
 int side_tracer_callback_variadic_register(struct side_event_description *desc,
                void (*call_variadic)(const struct side_event_description *desc,
-                       const struct side_arg_vec *sav_desc,
+                       const struct side_arg_vec *side_arg_vec,
                        const struct side_arg_dynamic_event_struct *var_struct,
                        void *priv),
                void *priv);
 int side_tracer_callback_unregister(struct side_event_description *desc,
                void (*call)(const struct side_event_description *desc,
-                       const struct side_arg_vec *sav_desc,
+                       const struct side_arg_vec *side_arg_vec,
                        void *priv),
                void *priv);
 int side_tracer_callback_variadic_unregister(struct side_event_description *desc,
                void (*call_variadic)(const struct side_event_description *desc,
-                       const struct side_arg_vec *sav_desc,
+                       const struct side_arg_vec *side_arg_vec,
                        const struct side_arg_dynamic_event_struct *var_struct,
                        void *priv),
                void *priv);

diff --git a/src/side.c b/src/side.c
index f01a69f1691775e50107f2f5e6b76fb37832e6a5..23bb74332d0f361aec1c9f27abf28f7b1e95bf7e 100644 (file)
--- a/src/side.c
+++ b/src/side.c
@@ -66,7 +66,7 @@ const struct side_callback side_empty_callback;
 void side_init(void) __attribute__((constructor));
 void side_exit(void) __attribute__((destructor));
 
-void side_call(const struct side_event_description *desc, const struct side_arg_vec *sav_desc)
+void side_call(const struct side_event_description *desc, const struct side_arg_vec *side_arg_vec)
 {
        const struct side_callback *side_cb;
        unsigned int rcu_period;
@@ -86,12 +86,12 @@ void side_call(const struct side_event_description *desc, const struct side_arg_
        }
        rcu_period = side_rcu_read_begin(&rcu_gp);
        for (side_cb = side_rcu_dereference(desc->callbacks); side_cb->u.call != NULL; side_cb++)
-               side_cb->u.call(desc, sav_desc, side_cb->priv);
+               side_cb->u.call(desc, side_arg_vec, side_cb->priv);
        side_rcu_read_end(&rcu_gp, rcu_period);
 }
 
 void side_call_variadic(const struct side_event_description *desc,
-       const struct side_arg_vec *sav_desc,
+       const struct side_arg_vec *side_arg_vec,
        const struct side_arg_dynamic_event_struct *var_struct)
 {
        const struct side_callback *side_cb;
@@ -112,7 +112,7 @@ void side_call_variadic(const struct side_event_description *desc,
        }
        rcu_period = side_rcu_read_begin(&rcu_gp);
        for (side_cb = side_rcu_dereference(desc->callbacks); side_cb->u.call_variadic != NULL; side_cb++)
-               side_cb->u.call_variadic(desc, sav_desc, var_struct, side_cb->priv);
+               side_cb->u.call_variadic(desc, side_arg_vec, var_struct, side_cb->priv);
        side_rcu_read_end(&rcu_gp, rcu_period);
 }
 
@@ -183,7 +183,7 @@ unlock:
 
 int side_tracer_callback_register(struct side_event_description *desc,
                void (*call)(const struct side_event_description *desc,
-                       const struct side_arg_vec *sav_desc,
+                       const struct side_arg_vec *side_arg_vec,
                        void *priv),
                void *priv)
 {
@@ -194,7 +194,7 @@ int side_tracer_callback_register(struct side_event_description *desc,
 
 int side_tracer_callback_variadic_register(struct side_event_description *desc,
                void (*call_variadic)(const struct side_event_description *desc,
-                       const struct side_arg_vec *sav_desc,
+                       const struct side_arg_vec *side_arg_vec,
                        const struct side_arg_dynamic_event_struct *var_struct,
                        void *priv),
                void *priv)
@@ -255,7 +255,7 @@ unlock:
 
 int side_tracer_callback_unregister(struct side_event_description *desc,
                void (*call)(const struct side_event_description *desc,
-                       const struct side_arg_vec *sav_desc,
+                       const struct side_arg_vec *side_arg_vec,
                        void *priv),
                void *priv)
 {
@@ -266,7 +266,7 @@ int side_tracer_callback_unregister(struct side_event_description *desc,
 
 int side_tracer_callback_variadic_unregister(struct side_event_description *desc,
                void (*call_variadic)(const struct side_event_description *desc,
-                       const struct side_arg_vec *sav_desc,
+                       const struct side_arg_vec *side_arg_vec,
                        const struct side_arg_dynamic_event_struct *var_struct,
                        void *priv),
                void *priv)

diff --git a/src/tracer.c b/src/tracer.c
index c19fa9674886c575571f914ea4bfff85868ed19b..704f5371461f078eb2a7db9a0632a536e28e0ab3 100644 (file)
--- a/src/tracer.c
+++ b/src/tracer.c
@@ -22,13 +22,13 @@ enum tracer_display_base {
 static struct side_tracer_handle *tracer_handle;
 
 static
-void tracer_print_struct(const struct side_type *type_desc, const struct side_arg_vec *sav_desc);
+void tracer_print_struct(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec);
 static
 void tracer_print_struct_sg(const struct side_type *type_desc, void *ptr);
 static
-void tracer_print_array(const struct side_type *type_desc, const struct side_arg_vec *sav_desc);
+void tracer_print_array(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec);
 static
-void tracer_print_vla(const struct side_type *type_desc, const struct side_arg_vec *sav_desc);
+void tracer_print_vla(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec);
 static
 void tracer_print_vla_visitor(const struct side_type *type_desc, void *app_ctx);
 static
@@ -977,10 +977,10 @@ void tracer_print_field(const struct side_event_field *item_desc, const struct s
 }
 
 static
-void tracer_print_struct(const struct side_type *type_desc, const struct side_arg_vec *sav_desc)
+void tracer_print_struct(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec)
 {
-       const struct side_arg *sav = sav_desc->sav;
-       uint32_t side_sav_len = sav_desc->len;
+       const struct side_arg *sav = side_arg_vec->sav;
+       uint32_t side_sav_len = side_arg_vec->len;
        int i;
 
        if (type_desc->u.side_struct->nr_fields != side_sav_len) {
@@ -1056,10 +1056,10 @@ void tracer_print_struct_sg(const struct side_type *type_desc, void *ptr)
 }
 
 static
-void tracer_print_array(const struct side_type *type_desc, const struct side_arg_vec *sav_desc)
+void tracer_print_array(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec)
 {
-       const struct side_arg *sav = sav_desc->sav;
-       uint32_t side_sav_len = sav_desc->len;
+       const struct side_arg *sav = side_arg_vec->sav;
+       uint32_t side_sav_len = side_arg_vec->len;
        int i;
 
        if (type_desc->u.side_array.length != side_sav_len) {
@@ -1078,10 +1078,10 @@ void tracer_print_array(const struct side_type *type_desc, const struct side_arg
 }
 
 static
-void tracer_print_vla(const struct side_type *type_desc, const struct side_arg_vec *sav_desc)
+void tracer_print_vla(const struct side_type *type_desc, const struct side_arg_vec *side_arg_vec)
 {
-       const struct side_arg *sav = sav_desc->sav;
-       uint32_t side_sav_len = sav_desc->len;
+       const struct side_arg *sav = side_arg_vec->sav;
+       uint32_t side_sav_len = side_arg_vec->len;
        int i;
 
        print_attributes("attr", ":", type_desc->u.side_vla.attr, type_desc->u.side_vla.nr_attr);
@@ -1567,11 +1567,11 @@ void tracer_print_dynamic(const struct side_arg *item)
 
 static
 void tracer_print_static_fields(const struct side_event_description *desc,
-               const struct side_arg_vec *sav_desc,
+               const struct side_arg_vec *side_arg_vec,
                int *nr_items)
 {
-       const struct side_arg *sav = sav_desc->sav;
-       uint32_t side_sav_len = sav_desc->len;
+       const struct side_arg *sav = side_arg_vec->sav;
+       uint32_t side_sav_len = side_arg_vec->len;
        int i;
 
        printf("provider: %s, event: %s", desc->provider_name, desc->event_name);
@@ -1592,24 +1592,24 @@ void tracer_print_static_fields(const struct side_event_description *desc,
 }
 
 void tracer_call(const struct side_event_description *desc,
-               const struct side_arg_vec *sav_desc,
+               const struct side_arg_vec *side_arg_vec,
                void *priv __attribute__((unused)))
 {
        int nr_fields = 0;
 
-       tracer_print_static_fields(desc, sav_desc, &nr_fields);
+       tracer_print_static_fields(desc, side_arg_vec, &nr_fields);
        printf("\n");
 }
 
 void tracer_call_variadic(const struct side_event_description *desc,
-               const struct side_arg_vec *sav_desc,
+               const struct side_arg_vec *side_arg_vec,
                const struct side_arg_dynamic_event_struct *var_struct,
                void *priv __attribute__((unused)))
 {
        uint32_t var_struct_len = var_struct->len;
        int nr_fields = 0, i;
 
-       tracer_print_static_fields(desc, sav_desc, &nr_fields);
+       tracer_print_static_fields(desc, side_arg_vec, &nr_fields);
 
        if (side_unlikely(!(desc->flags & SIDE_EVENT_FLAG_VARIADIC))) {
                fprintf(stderr, "ERROR: unexpected non-variadic event description\n");

diff --git a/src/tracer.h b/src/tracer.h
index 5f4820c17dee84a05470c091bd6ec1d77222082d..e6fc0126ef56fd72df514d1e014fdb5c7242dbe6 100644 (file)
--- a/src/tracer.h
+++ b/src/tracer.h
@@ -9,10 +9,10 @@
 #include <side/trace.h>
 
 void tracer_call(const struct side_event_description *desc,
-       const struct side_arg_vec *sav_desc,
+       const struct side_arg_vec *side_arg_vec,
        void *priv);
 void tracer_call_variadic(const struct side_event_description *desc,
-       const struct side_arg_vec *sav_desc,
+       const struct side_arg_vec *side_arg_vec,
        const struct side_arg_dynamic_event_struct *var_struct,
        void *priv);