X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=include%2Fust%2Ftracepoint.h;h=43c1b46b4a6df4ce0047915af7133e1a44989ac8;hb=b979b3468dc6a9329288f53ce568815617780d9c;hp=49a9b6e65bcc26807b57712de321df0e6abcc069;hpb=f08ebbe29cc9f6fa1c108907be5d9d92d297067e;p=ust.git diff --git a/include/ust/tracepoint.h b/include/ust/tracepoint.h index 49a9b6e..43c1b46 100644 --- a/include/ust/tracepoint.h +++ b/include/ust/tracepoint.h @@ -27,28 +27,37 @@ #define _LGPL_SOURCE #include -#include #include -struct module; struct tracepoint; -struct probe { +struct tracepoint_probe { void *func; void *data; }; struct tracepoint { const char *name; /* Tracepoint name */ - DEFINE_IMV(char, state); /* State. */ - struct probe *probes; + char state; /* State. */ + struct tracepoint_probe *probes; }; -#define PARAMS(args...) args - +#define TP_PARAMS(args...) args #define TP_PROTO(args...) args #define TP_ARGS(args...) args +/* + * Tracepoints should be added to the instrumented code using the + * "tracepoint()" macro. + */ +#define tracepoint(name, args...) __trace_##name(args) + +#define register_tracepoint(name, probe, data) \ + __register_trace_##name(probe, data) + +#define unregister_tracepoint(name, probe, data) \ + __unregister_trace_##name(probe, data) + #define CONFIG_TRACEPOINTS #ifdef CONFIG_TRACEPOINTS @@ -58,66 +67,50 @@ struct tracepoint { */ #define __DO_TRACE(tp, proto, args) \ do { \ - struct probe *it_probe_ptr; \ - void *it_func; \ - void *__data; \ + struct tracepoint_probe *__tp_it_probe_ptr; \ + void *__tp_it_func; \ + void *__tp_cb_data; \ \ rcu_read_lock(); \ - it_probe_ptr = rcu_dereference((tp)->probes); \ - if (it_probe_ptr) { \ + __tp_it_probe_ptr = rcu_dereference((tp)->probes); \ + if (__tp_it_probe_ptr) { \ do { \ - it_func = (it_probe_ptr)->func; \ - __data = (it_probe_ptr)->data; \ - ((void(*)(proto))(it_func))(args); \ - } while ((++it_probe_ptr)->func); \ + __tp_it_func = __tp_it_probe_ptr->func; \ + __tp_cb_data = __tp_it_probe_ptr->data; \ + ((void(*)(proto))__tp_it_func)(args); \ + } while ((++__tp_it_probe_ptr)->func); \ } \ rcu_read_unlock(); \ } while (0) -#define __CHECK_TRACE(name, generic, proto, args) \ +#define __CHECK_TRACE(name, proto, args) \ do { \ - if (!generic) { \ - if (unlikely(imv_read(__tracepoint_##name.state))) \ - __DO_TRACE(&__tracepoint_##name, \ - TP_PROTO(proto), TP_ARGS(args)); \ - } else { \ - if (unlikely(_imv_read(__tracepoint_##name.state))) \ - __DO_TRACE(&__tracepoint_##name, \ - TP_PROTO(proto), TP_ARGS(args)); \ - } \ + if (unlikely(__tracepoint_##name.state)) \ + __DO_TRACE(&__tracepoint_##name, \ + TP_PROTO(proto), TP_ARGS(args)); \ } while (0) /* * Make sure the alignment of the structure in the __tracepoints section will * not add unwanted padding between the beginning of the section and the * structure. Force alignment to the same alignment as the section start. - * - * The "generic" argument, passed to the declared __trace_##name inline - * function controls which tracepoint enabling mechanism must be used. - * If generic is true, a variable read is used. - * If generic is false, immediate values are used. */ #define __DECLARE_TRACE(name, proto, args, data_proto, data_args) \ extern struct tracepoint __tracepoint_##name; \ - static inline void trace_##name(proto) \ + static inline void __trace_##name(proto) \ { \ - __CHECK_TRACE(name, 0, TP_PROTO(data_proto), \ - TP_ARGS(data_args)); \ - } \ - static inline void _trace_##name(proto) \ - { \ - __CHECK_TRACE(name, 1, TP_PROTO(data_proto), \ + __CHECK_TRACE(name, TP_PROTO(data_proto), \ TP_ARGS(data_args)); \ } \ static inline int \ - register_trace_##name(void (*probe)(data_proto), void *data) \ + __register_trace_##name(void (*probe)(data_proto), void *data) \ { \ return tracepoint_probe_register(#name, (void *)probe, \ data); \ \ } \ static inline int \ - unregister_trace_##name(void (*probe)(data_proto), void *data) \ + __unregister_trace_##name(void (*probe)(data_proto), void *data)\ { \ return tracepoint_probe_unregister(#name, (void *)probe, \ data); \ @@ -145,11 +138,11 @@ extern void tracepoint_update_probe_range(struct tracepoint * const *begin, { } \ static inline void _trace_##name(proto) \ { } \ - static inline int register_trace_##name(void (*probe)(proto), void *data) \ + static inline int __register_trace_##name(void (*probe)(proto), void *data) \ { \ return -ENOSYS; \ } \ - static inline int unregister_trace_##name(void (*probe)(proto), void *data) \ + static inline int __unregister_trace_##name(void (*probe)(proto), void *data) \ { \ return -ENOSYS; \ } @@ -163,10 +156,27 @@ static inline void tracepoint_update_probe_range(struct tracepoint *begin, { } #endif /* CONFIG_TRACEPOINTS */ -#define DECLARE_TRACE(name, proto, args) \ - __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \ - PARAMS(void *__data, proto), \ - PARAMS(__data, args)) +/* + * The need for the DECLARE_TRACE_NOARGS() is to handle the prototype + * (void). "void" is a special value in a function prototype and can + * not be combined with other arguments. Since the DECLARE_TRACE() + * macro adds a data element at the beginning of the prototype, + * we need a way to differentiate "(void *data, proto)" from + * "(void *data, void)". The second prototype is invalid. + * + * DECLARE_TRACE_NOARGS() passes "void" as the tracepoint prototype + * and "void *__tp_cb_data" as the callback prototype. + * + * DECLARE_TRACE() passes "proto" as the tracepoint protoype and + * "void *__tp_cb_data, proto" as the callback prototype. + */ +#define DECLARE_TRACE_NOARGS(name) \ + __DECLARE_TRACE(name, void, , void *__tp_cb_data, __tp_cb_data) + +#define DECLARE_TRACE(name, proto, args) \ + __DECLARE_TRACE(name, TP_PARAMS(proto), TP_PARAMS(args),\ + TP_PARAMS(void *__tp_cb_data, proto), \ + TP_PARAMS(__tp_cb_data, args)) /* * Connect a probe to a tracepoint. @@ -187,7 +197,6 @@ extern int tracepoint_probe_unregister_noupdate(const char *name, void *probe, extern void tracepoint_probe_update_all(void); struct tracepoint_iter { -//ust// struct module *module; struct tracepoint_lib *lib; struct tracepoint * const *tracepoint; }; @@ -397,15 +406,15 @@ extern int trace_event_unregister_lib(struct trace_event * const *start_trace_ev #define DECLARE_TRACE_EVENT_CLASS(name, proto, args, tstruct, assign, print) #define DEFINE_TRACE_EVENT(template, name, proto, args) \ - DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) + DECLARE_TRACE(name, TP_PARAMS(proto), TP_PARAMS(args)) #define DEFINE_TRACE_EVENT_PRINT(template, name, proto, args, print) \ - DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) + DECLARE_TRACE(name, TP_PARAMS(proto), TP_PARAMS(args)) #define TRACE_EVENT(name, proto, args, struct, assign, print) \ - DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) + DECLARE_TRACE(name, TP_PARAMS(proto), TP_PARAMS(args)) #define TRACE_EVENT_FN(name, proto, args, struct, \ assign, print, reg, unreg) \ - DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) + DECLARE_TRACE(name, TP_PARAMS(proto), TP_PARAMS(args)) #endif /* ifdef TRACE_EVENT (see note above) */