X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Ffork%2Fust_tests_fork.h;h=d8962c93a00227a0a8d9e5a002aa2bbafbf82f82;hb=68d9f89e9fced1108fdde97c53504d05d183ccdb;hp=27e6b47e737ad9fb939f5708d6fb5b56a17f2656;hpb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;p=lttng-ust.git

diff --git a/tests/fork/ust_tests_fork.h b/tests/fork/ust_tests_fork.h
index 27e6b47e..d8962c93 100644
--- a/tests/fork/ust_tests_fork.h
+++ b/tests/fork/ust_tests_fork.h
@@ -1,5 +1,5 @@
-#undef TRACEPOINT_SYSTEM
-#define TRACEPOINT_SYSTEM ust_tests_fork
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER ust_tests_fork
 
 #if !defined(_TRACEPOINT_UST_TESTS_FORK_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_FORK_H
@@ -7,50 +7,46 @@
 /*
  * 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 <lttng/tracepoint.h>
 #include <sys/types.h>
 
-TRACEPOINT_EVENT_NOARGS(ust_tests_fork_before_fork,
+TRACEPOINT_EVENT(ust_tests_fork, before_fork,
+	TP_ARGS(),
 	TP_FIELDS()
 )
 
-TRACEPOINT_EVENT(ust_tests_fork_after_fork_child,
-	TP_PROTO(pid_t pid),
-	TP_ARGS(pid),
+TRACEPOINT_EVENT(ust_tests_fork, after_fork_child,
+	TP_ARGS(pid_t, pid),
 	TP_FIELDS(
 		ctf_integer(pid_t, pid, pid)
 	)
 )
 
-TRACEPOINT_EVENT_NOARGS(ust_tests_fork_after_fork_parent,
+TRACEPOINT_EVENT(ust_tests_fork, after_fork_parent,
+	TP_ARGS(),
 	TP_FIELDS()
 )
 
-TRACEPOINT_EVENT_NOARGS(ust_tests_fork_after_exec,
+TRACEPOINT_EVENT(ust_tests_fork, after_exec,
+	TP_ARGS(),
 	TP_FIELDS()
 )
 
 #endif /* _TRACEPOINT_UST_TESTS_FORK_H */
 
-#undef TRACEPOINT_INCLUDE_PATH
-#define TRACEPOINT_INCLUDE_PATH .
 #undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ust_tests_fork
+#define TRACEPOINT_INCLUDE_FILE ./ust_tests_fork.h
 
-/* This part must be outside protection */
+/* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>