X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fdemo%2Fust_tests_demo.h;h=355867d2eb6d1c68fb5ffca6af1a2dd810190cef;hb=40b2b5a43e4c2067849770b3379ca5360facacd5;hp=c79ed891fda4500cf8cd6142784b878c294338b1;hpb=580d134ba57956bdf709ef892cd27df40b956656;p=lttng-ust.git

diff --git a/tests/demo/ust_tests_demo.h b/tests/demo/ust_tests_demo.h
index c79ed891..355867d2 100644
--- a/tests/demo/ust_tests_demo.h
+++ b/tests/demo/ust_tests_demo.h
@@ -11,43 +11,22 @@ 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.
+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+ * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
  *
- * 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
+ * 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.
  */
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(ust_tests_demo, loop,
-	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)
-		ctf_integer(long, longfield, anint)
-		ctf_integer_network(int, netintfield, netint)
-		ctf_integer_network_hex(int, netintfieldhex, netint)
-		ctf_array(long, arrfield1, values, 3)
-		ctf_array_text(char, arrfield2, text, 10)
-		ctf_sequence(char, seqfield1, text,
-			     size_t, textlen)
-		ctf_sequence_text(char, seqfield2, text,
-			     size_t, textlen)
-		ctf_string(stringfield, text)
-		ctf_float(float, floatfield, floatarg)
-		ctf_float(double, doublefield, doublearg)
-	)
+TRACEPOINT_LOGLEVEL_ENUM(
+	tp_loglevel(critical, 0)
+	tp_loglevel(warning, 1)
+	tp_loglevel(debug, 2)
 )
 
 TRACEPOINT_EVENT(ust_tests_demo, starting,
@@ -56,6 +35,7 @@ TRACEPOINT_EVENT(ust_tests_demo, starting,
 		ctf_integer(int, value, value)
 	)
 )
+TRACEPOINT_LOGLEVEL(ust_tests_demo, starting, critical)
 
 TRACEPOINT_EVENT(ust_tests_demo, done,
 	TP_ARGS(int, value),
@@ -63,13 +43,12 @@ TRACEPOINT_EVENT(ust_tests_demo, done,
 		ctf_integer(int, value, value)
 	)
 )
+TRACEPOINT_LOGLEVEL(ust_tests_demo, done, critical)
 
 #endif /* _TRACEPOINT_UST_TESTS_DEMO_H */
 
-#undef TRACEPOINT_INCLUDE_PATH
-#define TRACEPOINT_INCLUDE_PATH .
 #undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ust_tests_demo
+#define TRACEPOINT_INCLUDE_FILE ./ust_tests_demo.h
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>