X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fhello%2Ftp.c;h=71a01c811d4345dda991e895122c830c32a6b480;hb=35129359eb694e1d6d8daeabac302290cac41d11;hp=4eb7a27463e36b89e63a1ba1a9eea71ff8b25087;hpb=ad5c7b826145e951950bd1afa6fce17ea193bb48;p=lttng-ust.git

diff --git a/tests/hello/tp.c b/tests/hello/tp.c
index 4eb7a274..71a01c81 100644
--- a/tests/hello/tp.c
+++ b/tests/hello/tp.c
@@ -1,49 +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"
-
-struct hello_trace_struct {
-	char *message;
-};
-
-struct hello_trace_struct hello_struct = {
-	.message = "ehlo\n",
-};
-
-DEFINE_TRACE(hello_tptest);
-
-void tptest_probe(void *data, int anint)
-{
-	struct hello_trace_struct *hello;
-	hello=(struct hello_trace_struct *)data;
-	DBG("in tracepoint probe...");
-	printf("this is the message: %s\n", hello->message);
-}
-
-void tptest2_probe(void *data)
-{
-}
-
-static void __attribute__((constructor)) init()
-{
-	DBG("connecting tracepoint...\n");
-	register_tracepoint(hello_tptest, tptest_probe, &hello_struct);
-	register_tracepoint(hello_tptest2, tptest2_probe, &hello_struct);
-}
+#define TRACEPOINT_CREATE_PROBES
+#include "ust_tests_hello.h"