Introduce side_call*

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

diff --git a/include/side/trace.h b/include/side/trace.h
index 6a8ded78281df95f4ff6835b8eb8a88cef7bd406..77c6a25f21ba69d4c9c8399d5d09f537930ea4a3 100644 (file)
--- a/include/side/trace.h
+++ b/include/side/trace.h
@@ -243,6 +243,9 @@ enum side_event_flags {
        SIDE_EVENT_FLAG_VARIADIC = (1 << 0),
 };
 
+#define SIDE_EVENT_ENABLED_USER_MASK                   0x0000FFFF
+#define SIDE_EVENT_ENABLED_KERNEL_USER_EVENT_MASK      0x80000000
+
 struct side_event_description {
        uint32_t version;
        uint32_t enabled;
@@ -799,7 +802,7 @@ struct side_tracer_dynamic_vla_visitor_ctx {
                        .sav = side_sav, \
                        .len = SIDE_ARRAY_SIZE(side_sav), \
                }; \
-               tracer_call(desc, &sav_desc); \
+               side_call(desc, &sav_desc); \
        }
 
 #define side_event(desc, sav) \
@@ -818,7 +821,7 @@ struct side_tracer_dynamic_vla_visitor_ctx {
                        .fields = side_fields, \
                        .len = SIDE_ARRAY_SIZE(side_fields), \
                }; \
-               tracer_call_variadic(desc, &sav_desc, &var_struct); \
+               side_call_variadic(desc, &sav_desc, &var_struct); \
        }
 
 #define side_event_variadic(desc, sav, var) \
@@ -873,4 +876,10 @@ struct side_tracer_dynamic_vla_visitor_ctx {
 #define side_declare_event(_identifier) \
        struct side_event_description _identifier
 
+void side_call(const struct side_event_description *desc,
+       const struct side_arg_vec_description *sav_desc);
+void side_call_variadic(const struct side_event_description *desc,
+       const struct side_arg_vec_description *sav_desc,
+       const struct side_arg_dynamic_event_struct *var_struct);
+
 #endif /* _SIDE_TRACE_H */

diff --git a/src/Makefile b/src/Makefile
index 5056c136a04a45b3f0e9074c7942a5da1b8de547..5201974a94ed340900eed06261ca90a7a261e616 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,13 +1,16 @@
 all: test
 
+side.o: side.c
+       gcc -O2 -g -Wall -I../include/ -c -o side.o side.c
+
 tracer.o: tracer.c
        gcc -O2 -g -Wall -I../include/ -c -o tracer.o tracer.c
 
 test.o: test.c
        gcc -O2 -g -Wall -I../include/ -c -o test.o test.c
 
-test: tracer.o test.o
-       gcc -O2 -g -Wall -o test tracer.o test.o
+test: tracer.o test.o side.o
+       gcc -O2 -g -Wall -o test tracer.o test.o side.o
 
 .PHONY: clean
 

diff --git a/src/side.c b/src/side.c
new file mode 100644 (file)
index 0000000..6b67beb
--- /dev/null
+++ b/src/side.c
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright 2022 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ */
+
+#include <side/trace.h>
+#include "tracer.h"
+
+void side_call(const struct side_event_description *desc, const struct side_arg_vec_description *sav_desc)
+{
+       if (side_unlikely(desc->flags & SIDE_EVENT_FLAG_VARIADIC)) {
+               printf("ERROR: unexpected variadic event description\n");
+               abort();
+       }
+       if (side_unlikely(desc->enabled & SIDE_EVENT_ENABLED_KERNEL_USER_EVENT_MASK)) {
+               // TODO: call kernel ioctl.
+       }
+       //TODO: replace tracer_call by rcu iteration on list of registered callbacks
+       tracer_call(desc, sav_desc);
+}
+
+void side_call_variadic(const struct side_event_description *desc,
+       const struct side_arg_vec_description *sav_desc,
+       const struct side_arg_dynamic_event_struct *var_struct)
+{
+       if (side_unlikely(desc->enabled & SIDE_EVENT_ENABLED_KERNEL_USER_EVENT_MASK)) {
+               // TODO: call kernel ioctl.
+       }
+       //TODO: replace tracer_call by rcu iteration on list of registered callbacks
+       tracer_call_variadic(desc, sav_desc, var_struct);
+}

diff --git a/src/tracer.c b/src/tracer.c
index 3bd7dfc857ffb328457d38d7db250584c8db3d48..24d6189f600ab07e5092d9b5bd78ad7a484dce0e 100644 (file)
--- a/src/tracer.c
+++ b/src/tracer.c
@@ -893,10 +893,6 @@ void tracer_call(const struct side_event_description *desc, const struct side_ar
 {
        int nr_fields = 0;
 
-       if (side_unlikely(desc->flags & SIDE_EVENT_FLAG_VARIADIC)) {
-               printf("ERROR: unexpected variadic event description\n");
-               abort();
-       }
        tracer_print_static_fields(desc, sav_desc, &nr_fields);
        if (nr_fields)
                printf(" ]");