X-Git-Url: http://git.lttng.org/?p=ust.git;a=blobdiff_plain;f=tests%2Ftracepoint%2Ftracepoint_test.c;fp=tests%2Ftracepoint%2Ftracepoint_test.c;h=88cb3792f4529aec3e04f98cf482c39761d77930;hp=34cdb115dd32e8bfbe88927eab7263294d5fbe8c;hb=c8afcc1a6acebbc2137ab4a9b9d347d8d10278c6;hpb=f6572ddc976898c4ce77c484a3287a0cc7b57800

diff --git a/tests/tracepoint/tracepoint_test.c b/tests/tracepoint/tracepoint_test.c
index 34cdb11..88cb379 100644
--- a/tests/tracepoint/tracepoint_test.c
+++ b/tests/tracepoint/tracepoint_test.c
@@ -32,8 +32,8 @@
 #include <ust/marker.h>
 #include "tracepoint_test.h"
 
-DEFINE_TRACEPOINT(ust_event);
-DEFINE_TRACEPOINT(ust_event2);
+DEFINE_TRACE(ust_event);
+DEFINE_TRACE(ust_event2);
 
 static struct message msg_probe3 = {
 	.payload = "probe3",
@@ -47,7 +47,7 @@ void tp_probe4(void *data, unsigned int p4)
 {
 	int i;
 	for (i = 0; i < 100; i++) {
-		ust_marker_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;
-	ust_marker_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++) {
-		ust_marker_tp(event, ust_event, tp_probe2, "probe %u", 13);
+		ust_marker(event, "probe %u", 13);
 	}
 }
 
@@ -84,16 +84,16 @@ void tp_probe(void *data, unsigned int p1)
 {
 	int i;
 	for (i = 0; i < 5; i++) {
-		ust_marker_tp(event, ust_event, tp_probe, "probe %u", p1);
+		ust_marker(event,  "probe %u", p1);
 	}
 }
 
 static void __attribute__((constructor)) init()
 {
-	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);
+	__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) {