X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Ftracepoint%2Ftracepoint_test.c;h=88cb3792f4529aec3e04f98cf482c39761d77930;hb=c8afcc1a6acebbc2137ab4a9b9d347d8d10278c6;hp=88fa10b00916877b328ec4240e26ea96e0937483;hpb=686debc34cf055ffcb1f98a06df9fbaf27eeb441;p=ust.git

diff --git a/tests/tracepoint/tracepoint_test.c b/tests/tracepoint/tracepoint_test.c
index 88fa10b..88cb379 100644
--- a/tests/tracepoint/tracepoint_test.c
+++ b/tests/tracepoint/tracepoint_test.c
@@ -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,24 +84,24 @@ 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_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;
 }