X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-event.h;h=e7bcea92ea58d1912b15a4927f8e5b6b22f103dc;hb=273973c0f59628f3dc242fdf1a41d5f275b290e2;hp=2cbe4475226be98ac917c1adb27d11ec88e5e326;hpb=8511626a5d7af3d9c447f64dd1ecd9e2ce22763a;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index 2cbe4475..e7bcea92 100644
--- a/include/lttng/tracepoint-event.h
+++ b/include/lttng/tracepoint-event.h
@@ -1,14 +1,15 @@
 /*
  * Copyright (c) 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
 #ifdef __cplusplus
@@ -21,12 +22,14 @@ extern "C" {
 #define __tp_stringify(x)	__tp_stringify1(x)
 
 #undef TRACEPOINT_EVENT_INSTANCE
-#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)	\
-	_DEFINE_TRACEPOINT(provider, name)
+#define TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)
 
 #undef TRACEPOINT_EVENT
 #define TRACEPOINT_EVENT(_provider, _name, _args, _fields)		\
-	TRACEPOINT_EVENT_INSTANCE(_provider, _name, _name, _TP_PARAMS(_args))
+	TRACEPOINT_EVENT_CLASS(_provider, _name, _TP_PARAMS(_args),	\
+			_TP_PARAMS(_fields))				\
+	TRACEPOINT_EVENT_INSTANCE(_provider, _name, _name,		\
+			_TP_PARAMS(_args))
 
 #define TRACEPOINT_INCLUDE	__tp_stringify(TRACEPOINT_INCLUDE_FILE)
 
@@ -34,6 +37,9 @@ extern "C" {
 
 #define TRACEPOINT_HEADER_MULTI_READ
 #include TRACEPOINT_INCLUDE
+
+#include <lttng/ust-tracepoint-event.h>
+
 #undef TRACEPOINT_HEADER_MULTI_READ
 
 #define TRACEPOINT_CREATE_PROBES