X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Ftracef.c;h=fa001ea28c7245b3b5dde95a482b8935bbc4ddcc;hb=2df82195d140b39c40abfb43d526804a9d14d3da;hp=dcae3be746f45350d5d17b9decf5dae90e70de2b;hpb=5dadb547a77d4b03cd18908963d08c27b780b839;p=lttng-ust.git

diff --git a/liblttng-ust/tracef.c b/liblttng-ust/tracef.c
index dcae3be7..fa001ea2 100644
--- a/liblttng-ust/tracef.c
+++ b/liblttng-ust/tracef.c
@@ -23,25 +23,38 @@
 #define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stdio.h>
+#include <helper.h>
 
 #define TRACEPOINT_CREATE_PROBES
 #define TRACEPOINT_DEFINE
 #include "lttng-ust-tracef-provider.h"
 
-void _lttng_ust_tracef(const char *fmt, ...)
+static inline __attribute__((always_inline))
+void __lttng_ust_vtracef(const char *fmt, va_list ap)
 {
-	va_list ap;
 	char *msg;
-	int len;
+	const int len = vasprintf(&msg, fmt, ap);
 
-	va_start(ap, fmt);
-	len = vasprintf(&msg, fmt, ap);
 	/* len does not include the final \0 */
 	if (len < 0)
 		goto end;
 	__tracepoint_cb_lttng_ust_tracef___event(msg, len,
-		__builtin_return_address(0));
+		LTTNG_UST_CALLER_IP());
 	free(msg);
 end:
+	return;
+}
+
+void _lttng_ust_vtracef(const char *fmt, va_list ap)
+{
+	__lttng_ust_vtracef(fmt, ap);
+}
+
+void _lttng_ust_tracef(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	__lttng_ust_vtracef(fmt, ap);
 	va_end(ap);
 }