X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracef.h;h=37f7ae478d9aa0ffd3fc2020d8f5d7055aca8f14;hb=06294ff90351f02d01c65d186e3d993f624fef8d;hp=16a984b664166068759c832055bb699c6c09fb01;hpb=7dae71f2117c236a44bb78b023ad6100021707d8;p=lttng-ust.git

diff --git a/include/lttng/tracef.h b/include/lttng/tracef.h
index 16a984b6..37f7ae47 100644
--- a/include/lttng/tracef.h
+++ b/include/lttng/tracef.h
@@ -1,38 +1,47 @@
-#ifndef _LTTNG_UST_TRACEF_H
-#define _LTTNG_UST_TRACEF_H
-
 /*
- * Copyright (C) 2013-2014  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * 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:
+ * SPDX-License-Identifier: MIT
  *
- * 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>
  */
 
-#include <lttng/lttng-ust-tracef.h>
+#ifndef _LTTNG_UST_TRACEF_H
+#define _LTTNG_UST_TRACEF_H
+
+#include <lttng/ust-api-compat.h>
+#include <lttng/tp/lttng-ust-tracef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern
+void lttng_ust__tracef(const char *fmt, ...)
+	__attribute__((format(printf, 1, 2)));
 
 extern
-void _lttng_ust_tracef(const char *fmt, ...);
+void lttng_ust__vtracef(const char *fmt, va_list ap)
+	__attribute__((format(printf, 1, 0)));
+
+#define lttng_ust_tracef(fmt, ...)						\
+	do {								\
+		LTTNG_UST_STAP_PROBEV(tracepoint_lttng_ust_tracef, event, ## __VA_ARGS__); \
+		if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracef___event.state)) \
+			lttng_ust__tracef(fmt, ## __VA_ARGS__);		\
+	} while (0)
 
-#define tracef(fmt, ...)						\
+#define lttng_ust_vtracef(fmt, ap)						\
 	do {								\
-		STAP_PROBEV(tracepoint_lttng_ust_tracef, event, ## __VA_ARGS__); \
-		if (caa_unlikely(__tracepoint_lttng_ust_tracef___event.state)) \
-			_lttng_ust_tracef(fmt, ## __VA_ARGS__);		\
+		if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracef___event.state)) \
+			lttng_ust__vtracef(fmt, ap);		\
 	} while (0)
 
+#if LTTNG_UST_COMPAT_API(0)
+#define tracef		lttng_ust_tracef
+#define vtracef		lttng_ust_vtracef
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _LTTNG_UST_TRACEF_H */