*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
#define _LGPL_SOURCE
#include <urcu-bp.h>
-#include <ust/immediate.h>
#include <ust/core.h>
-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
*/
#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) \
{ \
- __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 \
{ }
#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.
extern void tracepoint_probe_update_all(void);
struct tracepoint_iter {
-//ust// struct module *module;
struct tracepoint_lib *lib;
struct tracepoint * const *tracepoint;
};
#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) */
projects / ust.git / blobdiff