Tracepoint API change: combine TP_PROTO and TP_VARS into TP_ARGS, remove _NOARGS...

[lttng-ust.git] / include / lttng / tracepoint-event.h

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index a102ce74bfa982ae2aec25522581b769de4bc6f0..e7ea461bcdb87dfd6cdb17673cf9712f8cb8b3fa 100644 (file)
--- a/include/lttng/tracepoint-event.h
+++ b/include/lttng/tracepoint-event.h
@@ -21,11 +21,11 @@
  * in their file should include this file. The following are macros that the
  * trace file may define:
  *
- * TRACEPOINT_SYSTEM defines the system the tracepoint is for:
+ * TRACEPOINT_PROVIDER defines the provider the tracepoint is for:
  *     < [com_company_]project_[component_] >
  *
  * TRACEPOINT_INCLUDE_FILE if the file name is something other than
- *     TRACEPOINT_SYSTEM.h. This macro may be defined to tell
+ *     TRACEPOINT_PROVIDER.h. This macro may be defined to tell
  *     define_trace.h what file to include.  Note, leave off the ".h".
  *
  * TRACEPOINT_INCLUDE_PATH if the path is something other than within
@@ -52,38 +52,30 @@ extern "C" {
 #endif
 
 #undef TRACEPOINT_EVENT
-#define TRACEPOINT_EVENT(provider, name, proto, args, fields)          \
+#define TRACEPOINT_EVENT(provider, name, args, fields)                 \
        _DEFINE_TRACEPOINT(provider, name)
 
 #undef TRACEPOINT_EVENT_INSTANCE
-#define TRACEPOINT_EVENT_INSTANCE(provider, template, name, proto, args)       \
-       _DEFINE_TRACEPOINT(provider, name)
-
-#undef TRACEPOINT_EVENT_NOARGS
-#define TRACEPOINT_EVENT_NOARGS(provider, name, fields)                        \
-       _DEFINE_TRACEPOINT(provider, name)
-
-#undef TRACEPOINT_EVENT_INSTANCE_NOARGS
-#define TRACEPOINT_EVENT_INSTANCE_NOARGS(provider, template, name)     \
+#define TRACEPOINT_EVENT_INSTANCE(provider, template, name, args)      \
        _DEFINE_TRACEPOINT(provider, name)
 
 #undef TRACEPOINT_INCLUDE
 #undef __TRACEPOINT_INCLUDE
 
 #ifndef TRACEPOINT_INCLUDE_FILE
-# define TRACEPOINT_INCLUDE_FILE TRACEPOINT_SYSTEM
+# define TRACEPOINT_INCLUDE_FILE TRACEPOINT_PROVIDER
 # define UNDEF_TRACEPOINT_INCLUDE_FILE
 #endif
 
 #ifndef TRACEPOINT_INCLUDE_PATH
-# define __TRACEPOINT_INCLUDE(system) <tracepoint/system.h>
+# define __TRACEPOINT_INCLUDE(provider) <tracepoint/provider.h>
 # define UNDEF_TRACEPOINT_INCLUDE_PATH
 #else
-# define __TRACEPOINT_INCLUDE(system)                          \
-       __tp_stringify(TRACEPOINT_INCLUDE_PATH/system.h)
+# define __TRACEPOINT_INCLUDE(provider)                                \
+       __tp_stringify(TRACEPOINT_INCLUDE_PATH/provider.h)
 #endif
 
-# define TRACEPOINT_INCLUDE(system) __TRACEPOINT_INCLUDE(system)
+# define TRACEPOINT_INCLUDE(provider) __TRACEPOINT_INCLUDE(provider)
 
 /* Let the trace headers be reread */
 #define TRACEPOINT_HEADER_MULTI_READ
@@ -95,9 +87,6 @@ extern "C" {
 #undef TRACEPOINT_EVENT
 #undef TRACEPOINT_EVENT_CLASS
 #undef TRACEPOINT_EVENT_INSTANCE
-#undef TRACEPOINT_EVENT_NOARGS
-#undef TRACEPOINT_EVENT_CLASS_NOARGS
-#undef TRACEPOINT_EVENT_INSTANCE_NOARGS
 #undef TRACEPOINT_HEADER_MULTI_READ
 
 /* Only undef what we defined in this file */