Merge branch 'master' into dev

[lttng-ust.git] / tests / hello / tp.c

diff --git a/tests/hello/tp.c b/tests/hello/tp.c
index be10615a26d57f680100c19138fb1278d7eac794..71a01c811d4345dda991e895122c830c32a6b480 100644 (file)
--- a/tests/hello/tp.c
+++ b/tests/hello/tp.c
@@ -1,34 +1,17 @@
-/* Copyright (C) 2009  Pierre-Marc Fournier
+/*
+ * tp.c
  *
- * 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; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Copyright (c) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * 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.
+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+ * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
  *
- * 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 "tp.h"
-#include <ust/marker.h>
-#include "usterr.h"
-
-DEFINE_TRACE(hello_tptest);
-
-void tptest_probe(int anint)
-{
-       DBG("in tracepoint probe...");
-       trace_mark(ust, tptest, "anint %d", anint);
-}
-
-static void __attribute__((constructor)) init()
-{
-       DBG("connecting tracepoint...");
-       register_trace_hello_tptest(tptest_probe);
-}
+#define TRACEPOINT_CREATE_PROBES
+#include "ust_tests_hello.h"