Remove immediate values code (non-effective anyway)

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

diff --git a/include/ust/tracepoint.h b/include/ust/tracepoint.h
index b2e03cd46bfcdbac2b01b59417ebf3ddb80e601c..34272053947bcc7017bb73d1ea25eb47762a16da 100644 (file)
--- a/include/ust/tracepoint.h
+++ b/include/ust/tracepoint.h
@@ -27,7 +27,6 @@
 
 #define _LGPL_SOURCE
 #include <urcu-bp.h>
-#include <ust/immediate.h>
 #include <ust/core.h>
 
 struct module;
@@ -40,7 +39,7 @@ struct probe {
 
 struct tracepoint {
        const char *name;               /* Tracepoint name */
-       DEFINE_IMV(char, state);        /* State. */
+       char state;                     /* State. */
        struct probe *probes;
 };
 
@@ -86,39 +85,23 @@ struct tracepoint {
                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                                               \
@@ -175,10 +158,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 *__data" as the callback prototype.
+ *
+ * DECLARE_TRACE() passes "proto" as the tracepoint protoype and
+ * "void *__data, proto" as the callback prototype.
+ */
+#define DECLARE_TRACE_NOARGS(name)                                     \
+               __DECLARE_TRACE(name, void, , void *__data, __data)
+
+#define DECLARE_TRACE(name, proto, args)                               \
+               __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args),      \
+                               PARAMS(void *__data, proto),            \
+                               PARAMS(__data, args))
 
 /*
  * Connect a probe to a tracepoint.