X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fdemo%2Fust_tests_demo2.h;h=25d42ad18eea0cdf19c96a508a0c2a666b051fe4;hb=9e9e67a64cf9f9ccb97a1eb5de1abf3eb09ab679;hp=3cadfa8c281ee868218c1cc829ff208f4ce52413;hpb=25c9a6e9fdb95d9d1c57463ab513ab1db197128d;p=lttng-ust.git

diff --git a/tests/demo/ust_tests_demo2.h b/tests/demo/ust_tests_demo2.h
index 3cadfa8c..25d42ad1 100644
--- a/tests/demo/ust_tests_demo2.h
+++ b/tests/demo/ust_tests_demo2.h
@@ -11,24 +11,27 @@ 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.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_LOGLEVEL_ENUM(
-	tp_loglevel(other, 0)
-	tp_loglevel(other2, 1)
-	tp_loglevel(other3, 2)
-)
-
 TRACEPOINT_EVENT(ust_tests_demo2, loop,
 	TP_ARGS(int, anint, int, netint, long *, values,
 		 char *, text, size_t, textlen,
@@ -50,16 +53,16 @@ TRACEPOINT_EVENT(ust_tests_demo2, loop,
 		ctf_float(double, doublefield, doublearg)
 	)
 )
-TRACEPOINT_LOGLEVEL(ust_tests_demo2, loop, other3)
+TRACEPOINT_LOGLEVEL(ust_tests_demo2, loop, TRACE_WARNING)
 
 #endif /* _TRACEPOINT_UST_TESTS_DEMO2_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_tests_demo2.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_tests_demo2.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
 
-#ifdef __cplusplus 
+#ifdef __cplusplus
 }
 #endif