Privatize headers

[ust.git] / tests / tracepoint / benchmark / tracepoint_benchmark.c

diff --git a/tests/tracepoint/benchmark/tracepoint_benchmark.c b/tests/tracepoint/benchmark/tracepoint_benchmark.c
index 8af4b84afc67d6d13afc2eec326fc2c85b3d4359..c1208b09cd17ddc69f2d9355a5b648dba2284380 100644 (file)
--- a/tests/tracepoint/benchmark/tracepoint_benchmark.c
+++ b/tests/tracepoint/benchmark/tracepoint_benchmark.c
@@ -18,43 +18,45 @@
  */
 
 /*
- * This test is aimed at testing tracepoint *with* trace_mark :
+ * This test is aimed at testing tracepoint *with* ust_marker :
  *
  * 1) tracepoint named : "ust_event"
  *     -) Probe 1 registered and recording the value 42
  */
 
 #include <stdio.h>
+
+#define TRACEPOINT_CREATE_PROBES
 #include "tracepoint_benchmark.h"
-#include <ust/type-serializer.h>
 
-#define NR_EVENTS      10000000
+/* Yes, this is now internal. */
+#include "../../../libust/type-serializer.h"
 
-DEFINE_TRACE(ust_event);
+#define NR_EVENTS      10000000
 
 void tp_probe(void *data, unsigned int p1);
 
-DEFINE_MARKER_TP(ust, event, ust_event, tp_probe, "p1 %u");
+DEFINE_UST_MARKER_TP(event, ust_event, tp_probe, "p1 %u");
 
 /*
  * Probe 1 --> ust_event
  */
 void tp_probe(void *data, unsigned int p1)
 {
-       struct marker *marker;
+       struct ust_marker *marker;
 
-       marker = &GET_MARKER(ust, event);
+       marker = &GET_UST_MARKER(event);
        ltt_specialized_trace(marker, data, &p1, sizeof(p1), sizeof(p1));
 }
 
 static void __attribute__((constructor)) init()
 {
-       register_trace_ust_event(tp_probe, NULL);
+       __register_tracepoint(ust_event, tp_probe, NULL);
 }
 
 void single_trace(unsigned int v)
 {
-       trace_ust_event(v);
+       tracepoint(ust_event, v);
 }
 
 void do_trace(void)