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

diff --git a/liblttng-ust/tracef.c b/liblttng-ust/tracef.c
index dcae3be7..0ce6d11f 100644
--- a/liblttng-ust/tracef.c
+++ b/liblttng-ust/tracef.c
@@ -1,47 +1,47 @@
 /*
- * Copyright (C) 2013-2014  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: MIT
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright (C) 2013-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stdio.h>
+#include <ust-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, format(printf, 1, 0)))
+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;
+}
+
+__attribute__((format(printf, 1, 0)))
+void _lttng_ust_vtracef(const char *fmt, va_list ap);
+void _lttng_ust_vtracef(const char *fmt, va_list ap)
+{
+	__lttng_ust_vtracef(fmt, ap);
+}
+
+__attribute__((format(printf, 1, 2)))
+void _lttng_ust_tracef(const char *fmt, ...);
+void _lttng_ust_tracef(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	__lttng_ust_vtracef(fmt, ap);
 	va_end(ap);
 }