Tracepoint and TRACEPOINT_EVENT API cleanup

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

diff --git a/tests/hello/tp.c b/tests/hello/tp.c
index 05cd7a2d703997a9ea65260527d73e806ed7ed8b..dfe06dd4198232bef9aa577012b53e1d45ca616a 100644 (file)
--- a/tests/hello/tp.c
+++ b/tests/hello/tp.c
@@ -1,4 +1,6 @@
-/* Copyright (C) 2009  Pierre-Marc Fournier
+/*
+ * Copyright (C) 2009  Pierre-Marc Fournier
+ * 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
@@ -15,10 +17,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "tp.h"
 #include <ust/marker.h>
 #include "usterr.h"
 
+#define TRACEPOINT_CREATE_PROBES
+#include "tp.h"
+
 struct hello_trace_struct {
        char *message;
 };
@@ -27,12 +31,10 @@ struct hello_trace_struct hello_struct = {
        .message = "ehlo\n",
 };
 
-DEFINE_TRACEPOINT(hello_tptest);
-
 void tptest_probe(void *data, int anint)
 {
        struct hello_trace_struct *hello;
-       hello=(struct hello_trace_struct *)data;
+       hello = (struct hello_trace_struct *)data;
        DBG("in tracepoint probe...");
        printf("this is the message: %s\n", hello->message);
 }
@@ -44,6 +46,10 @@ 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);
+       /*
+        * Note: this is an internal API that will be used within
+        * TRACEPOINT_EVENT only eventually.
+        */
+       __register_tracepoint(hello_tptest, tptest_probe, &hello_struct);
+       __register_tracepoint(hello_tptest2, tptest2_probe, &hello_struct);
 }