Tracepoints: namespace cleanups

[ust.git] / include / ust / ust_trace.h

diff --git a/include/ust/ust_trace.h b/include/ust/ust_trace.h
index 66f1e878f355de9ab2651325ffdd73b5c3c92178..d70ad17833b567a4124c2e11bf78b9e3aa9c0dc3 100644 (file)
--- a/include/ust/ust_trace.h
+++ b/include/ust/ust_trace.h
@@ -32,12 +32,12 @@
 #undef TRACE_EVENT
 #define TRACE_EVENT(name, proto, args, tstruct, assign, print)         \
        DECLARE_TRACE_EVENT_CLASS(name,                                 \
-                                 PARAMS(proto),                        \
-                                 PARAMS(args),                         \
-                                 PARAMS(tstruct),                      \
-                                 PARAMS(assign),                       \
-                                 PARAMS(print));                       \
-       DEFINE_TRACE_EVENT(name, name, PARAMS(proto), PARAMS(args));
+                                 TP_PARAMS(proto),                     \
+                                 TP_PARAMS(args),                      \
+                                 TP_PARAMS(tstruct),                   \
+                                 TP_PARAMS(assign),                    \
+                                 TP_PARAMS(print));                    \
+       DEFINE_TRACE_EVENT(name, name, TP_PARAMS(proto), TP_PARAMS(args));
 
 #undef __field
 #define __field(type, item)            type    item;
@@ -70,11 +70,11 @@
        }                                                               \
        static inline int register_event_##name(void *data)             \
        {                                                               \
-               return register_trace_##name(trace_printf_##name, data); \
+               return register_tracepoint(name, trace_printf_##name, data); \
        }                                                               \
        static inline int unregister_event_##name(void *data)           \
        {                                                               \
-               return unregister_trace_##name(trace_printf_##name, data); \
+               return unregister_tracepoint(name, trace_printf_##name, data); \
        }                                                               \
        struct trace_event __event_##name = {                           \
                __tpstrtab_##name,                                      \
@@ -88,7 +88,7 @@
        static void __attribute__((constructor)) init_##name()          \
        {                                                               \
                void *dummy = NULL;                                     \
-               register_trace_##name(trace_printf_##name, dummy);      \
+               register_tracepoint(name, trace_printf_##name, dummy);  \
        }