X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fdemo%2Fust_tests_demo.h;h=1b761f9fffba8a5d53585a19683ce3aae6aa2ba2;hb=86637aa6452f66dee5f769461668c2ea059b3a30;hp=d74932825d2cf1dae8a9c31bdabeee0e00f24487;hpb=8e90eb06e6106d536519009cb297c479643b4150;p=lttng-ust.git

diff --git a/tests/demo/ust_tests_demo.h b/tests/demo/ust_tests_demo.h
index d7493282..1b761f9f 100644
--- a/tests/demo/ust_tests_demo.h
+++ b/tests/demo/ust_tests_demo.h
@@ -11,54 +11,26 @@ extern "C" {
 /*
  * 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.
  */
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_LOGLEVEL_ENUM(
-	tp_loglevel(critical, 0)
-	tp_loglevel(warning, 1)
-	tp_loglevel(debug, 2)
-)
-
-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(ust_tests_demo, loop, debug)
-
 TRACEPOINT_EVENT(ust_tests_demo, starting,
 	TP_ARGS(int, value),
 	TP_FIELDS(
 		ctf_integer(int, value, value)
 	)
 )
-TRACEPOINT_LOGLEVEL(ust_tests_demo, starting, critical)
+TRACEPOINT_LOGLEVEL(ust_tests_demo, starting, TRACE_CRIT)
 
 TRACEPOINT_EVENT(ust_tests_demo, done,
 	TP_ARGS(int, value),
@@ -66,7 +38,7 @@ TRACEPOINT_EVENT(ust_tests_demo, done,
 		ctf_integer(int, value, value)
 	)
 )
-TRACEPOINT_LOGLEVEL(ust_tests_demo, done, critical)
+TRACEPOINT_LOGLEVEL(ust_tests_demo, done, TRACE_CRIT)
 
 #endif /* _TRACEPOINT_UST_TESTS_DEMO_H */