Add backward compatibility for tracepoints (qemu-kvm is using them)

Don't break compatibility needlessly before UST 2.0.

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

diff --git a/include/ust/marker.h b/include/ust/marker.h
index e8608a96b2c700740b09378ef517c3562be1b780..dbdbbe09f75bea1ddbedf8a4f00cb94205070c63 100644 (file)
--- a/include/ust/marker.h
+++ b/include/ust/marker.h
@@ -127,11 +127,6 @@ struct ust_marker {
 #define ust_marker(name, format, args...) \
        __ust_marker(ust, name, NULL, format, ## args)
 
-static inline __attribute__((deprecated))
-void __trace_mark_is_deprecated()
-{
-}
-
 /**
  * UST_MARKER_NOARGS - Format string for a marker with no argument.
  */
@@ -196,7 +191,6 @@ int ust_marker_unregister_lib(struct ust_marker * const *ust_marker_start);
  * ust_marker().
  */
 #define trace_mark(channel, name, format, args...)     \
-       __trace_mark_is_deprecated();                   \
        ust_marker(name, format, ## args)
 
 static inline __attribute__((deprecated))

diff --git a/include/ust/tracepoint.h b/include/ust/tracepoint.h
index 3d61f72883c762cc44ad64fb5c4c005d281d2084..9463e4072fa6411d054a2c0f74bd7f6b3f9631f2 100644 (file)
--- a/include/ust/tracepoint.h
+++ b/include/ust/tracepoint.h
@@ -124,6 +124,29 @@ struct tracepoint {
        {                                                               \
                return __tracepoint_probe_unregister(#name, (void *)probe, \
                                                   data);               \
+       }                                                               \
+       /*                                                              \
+        * Backward-compatibility API (will be deprecated):             \
+        * trace_*                                                      \
+        * register_trace_*                                             \
+        * unregister_trace_*                                           \
+        */                                                             \
+       static inline void trace_##name(proto)                          \
+       {                                                               \
+               __CHECK_TRACE(name, TP_PROTO(proto),                    \
+                             TP_ARGS(args));                           \
+       }                                                               \
+       static inline int                                               \
+       register_trace_##name(void (*probe)(proto))                     \
+       {                                                               \
+               return __tracepoint_probe_register(#name, (void *)probe,\
+                                                  NULL);               \
+       }                                                               \
+       static inline int                                               \
+       unregister_trace_##name(void (*probe)(proto))                   \
+       {                                                               \
+               return __tracepoint_probe_unregister(#name, (void *)probe, \
+                                                    NULL);             \
        }
 
 /*
@@ -194,6 +217,16 @@ int tracepoint_register_lib(struct tracepoint * const *tracepoints_start,
 extern
 int tracepoint_unregister_lib(struct tracepoint * const *tracepoints_start);
 
+/*
+ * Backward-compatibility API (will be deprecated):
+ * DEFINE_TRACE
+ * DECLARE_TRACE
+ * register_tracepoint
+ * unregister_tracepoint
+ */
+#define DEFINE_TRACE   _DEFINE_TRACEPOINT
+#define DECLARE_TRACE(name, proto, args)       \
+               _DECLARE_TRACEPOINT(name, TP_PARAMS(proto), TP_PARAMS(args))
 
 #ifndef TRACEPOINT_EVENT
 /*