X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fhello%2Fust_tests_hello.h;h=8a4063f60b929ffbc0a3e0f613f4b95afd36a9d2;hb=e92f3e285939848f248af08f11a39a04a7fcf852;hp=9e5043ddc6902760b931883894bcaf05bd893df3;hpb=9a396c3c901b720374bebc79d1bb9ab8f234ba38;p=lttng-ust.git

diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h
index 9e5043dd..8a4063f6 100644
--- a/tests/hello/ust_tests_hello.h
+++ b/tests/hello/ust_tests_hello.h
@@ -1,5 +1,5 @@
-#undef TRACEPOINT_SYSTEM
-#define TRACEPOINT_SYSTEM ust_tests_hello
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER ust_tests_hello
 
 #if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_HELLO_H
@@ -11,29 +11,23 @@ extern "C" {
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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; version 2.1 of
- * the License.
+ * 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:
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
-#include <ust/tracepoint.h>
+#include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(ust_tests_hello_tptest,
-	TP_PROTO(int anint, int netint, long *values,
-		 char *text, size_t textlen,
-		 double doublearg, float floatarg),
-	TP_ARGS(anint, netint, values, text, textlen,
-		doublearg, floatarg),
+TRACEPOINT_EVENT(ust_tests_hello, tptest,
+	TP_ARGS(int, anint, int, netint, long *, values,
+		 char *, text, size_t, textlen,
+		 double, doublearg, float, floatarg),
 	TP_FIELDS(
 		ctf_integer(int, intfield, anint)
 		ctf_integer_hex(int, intfield2, anint)
@@ -52,19 +46,18 @@ TRACEPOINT_EVENT(ust_tests_hello_tptest,
 	)
 )
 
-TRACEPOINT_EVENT_NOARGS(ust_tests_hello_tptest_sighandler,
+TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
+	TP_ARGS(),
 	TP_FIELDS()
 )
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
-#undef TRACEPOINT_INCLUDE_PATH
-#define TRACEPOINT_INCLUDE_PATH .
 #undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ust_tests_hello
+#define TRACEPOINT_INCLUDE_FILE ./ust_tests_hello.h
 
-/* This part must be outside protection */
-#include <ust/tracepoint-event.h>
+/* This part must be outside ifdef protection */
+#include <lttng/tracepoint-event.h>
 
 #ifdef __cplusplus 
 }