Fix tracepoint test with deprecated API

[ust.git] / tests / tracepoint / tracepoint_test.c

diff --git a/tests/tracepoint/tracepoint_test.c b/tests/tracepoint/tracepoint_test.c
index 6a5f691498a0be344c31a52bde1eb9bae5f787db..88cb3792f4529aec3e04f98cf482c39761d77930 100644 (file)
--- a/tests/tracepoint/tracepoint_test.c
+++ b/tests/tracepoint/tracepoint_test.c
@@ -16,7 +16,7 @@
  */
 
 /*
- * 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 13 (x5)
@@ -47,7 +47,7 @@ void tp_probe4(void *data, unsigned int p4)
 {
        int i;
        for (i = 0; i < 100; i++) {
-               trace_mark_tp(event2, ust_event2, tp_probe4, "probe4 %u", p4);
+               ust_marker(event2, "probe4 %u", p4);
        }
 }
 
@@ -60,8 +60,8 @@ void tp_probe3(void *data, unsigned int p3)
 {
        struct message *msg;
        msg = (struct message*) data;
-       trace_mark_tp(event_msg, ust_event_msg,
-                       tp_probe3, "probe %s", msg->payload);
+       ust_marker(event_msg,
+                        "probe %s", msg->payload);
 }
 
 /*
@@ -72,7 +72,7 @@ void tp_probe2(void *data, unsigned int p2)
 {
        int i;
        for (i = 0; i < 5; i++) {
-               trace_mark_tp(event, ust_event, tp_probe2, "probe %u", 13);
+               ust_marker(event, "probe %u", 13);
        }
 }
 
@@ -84,24 +84,24 @@ void tp_probe(void *data, unsigned int p1)
 {
        int i;
        for (i = 0; i < 5; i++) {
-               trace_mark_tp(event, ust_event, tp_probe, "probe %u", p1);
+               ust_marker(event,  "probe %u", p1);
        }
 }
 
 static void __attribute__((constructor)) init()
 {
-       register_trace_ust_event(tp_probe, NULL);
-       register_trace_ust_event(tp_probe2, NULL);
-       register_trace_ust_event(tp_probe3, &msg_probe3);
-       register_trace_ust_event2(tp_probe4, NULL);
+       __register_tracepoint(ust_event, tp_probe, NULL);
+       __register_tracepoint(ust_event, tp_probe2, NULL);
+       __register_tracepoint(ust_event, tp_probe3, &msg_probe3);
+       __register_tracepoint(ust_event2, tp_probe4, NULL);
 }
 
 int main(int argc, char **argv) {
        unsigned int v = 42;
        /* Tracepoint 1 : ust_event */
-       trace_ust_event(v);
+       tracepoint(ust_event, v);
        /* Tracepoint 2 : ust_event2 */
-       trace_ust_event2(v);
+       tracepoint(ust_event2, v);
 
        return 0;
 }