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 be10615a26d57f680100c19138fb1278d7eac794..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,20 +17,39 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "tp.h"
 #include <ust/marker.h>
 #include "usterr.h"
 
-DEFINE_TRACE(hello_tptest);
+#define TRACEPOINT_CREATE_PROBES
+#include "tp.h"
+
+struct hello_trace_struct {
+       char *message;
+};
+
+struct hello_trace_struct hello_struct = {
+       .message = "ehlo\n",
+};
 
-void tptest_probe(int anint)
+void tptest_probe(void *data, int anint)
 {
+       struct hello_trace_struct *hello;
+       hello = (struct hello_trace_struct *)data;
        DBG("in tracepoint probe...");
-       trace_mark(ust, tptest, "anint %d", anint);
+       printf("this is the message: %s\n", hello->message);
+}
+
+void tptest2_probe(void *data)
+{
 }
 
 static void __attribute__((constructor)) init()
 {
-       DBG("connecting tracepoint...");
-       register_trace_hello_tptest(tptest_probe);
+       DBG("connecting tracepoint...\n");
+       /*
+        * 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);
 }