X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracelog.h;h=837971f107e9a38676b0e911dc414dd36b016bb2;hb=2268c76ff5381c518789280f334f04cc4e41bb14;hp=50ef4ff0d8b581fc2ee2ede81cd4eed9395e40c1;hpb=0cb03c850dedb8f1e7f11e2e47764aa4d3ba313b;p=lttng-ust.git

diff --git a/include/lttng/tracelog.h b/include/lttng/tracelog.h
index 50ef4ff0..837971f1 100644
--- a/include/lttng/tracelog.h
+++ b/include/lttng/tracelog.h
@@ -1,64 +1,67 @@
-#ifndef _LTTNG_UST_TRACELOG_H
-#define _LTTNG_UST_TRACELOG_H
-
 /*
- * Copyright (C) 2013-2015  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-2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#include <lttng/lttng-ust-tracelog.h>
+#ifndef _LTTNG_UST_TRACELOG_H
+#define _LTTNG_UST_TRACELOG_H
+
+#include <lttng/ust-api-compat.h>
+#include <lttng/tp/lttng-ust-tracelog.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define TP_TRACELOG_CB_TEMPLATE(level) \
-	extern void _lttng_ust_tracelog_##level(const char *file, \
-		int line, const char *func, const char *fmt, ...)
+#define LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(level)					\
+	extern void lttng_ust__tracelog_##level(const char *file,	\
+		int line, const char *func, const char *fmt, ...)	\
+		__attribute__ ((format(printf, 4, 5)));			\
+									\
+	extern void lttng_ust__vtracelog_##level(const char *file,	\
+		int line, const char *func, const char *fmt,		\
+		va_list ap)						\
+		__attribute__ ((format(printf, 4, 0)));
+
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_EMERG);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_ALERT);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_CRIT);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_ERR);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_WARNING);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_NOTICE);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_INFO);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_SYSTEM);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROGRAM);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_PROCESS);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_MODULE);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_UNIT);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_FUNCTION);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG_LINE);
+LTTNG_UST_TP_TRACELOG_CB_TEMPLATE(LTTNG_UST_TRACEPOINT_LOGLEVEL_DEBUG);
 
-TP_TRACELOG_CB_TEMPLATE(emerg);
-TP_TRACELOG_CB_TEMPLATE(alert);
-TP_TRACELOG_CB_TEMPLATE(crit);
-TP_TRACELOG_CB_TEMPLATE(err);
-TP_TRACELOG_CB_TEMPLATE(warning);
-TP_TRACELOG_CB_TEMPLATE(notice);
-TP_TRACELOG_CB_TEMPLATE(info);
-TP_TRACELOG_CB_TEMPLATE(debug_system);
-TP_TRACELOG_CB_TEMPLATE(debug_program);
-TP_TRACELOG_CB_TEMPLATE(debug_process);
-TP_TRACELOG_CB_TEMPLATE(debug_module);
-TP_TRACELOG_CB_TEMPLATE(debug_unit);
-TP_TRACELOG_CB_TEMPLATE(debug_function);
-TP_TRACELOG_CB_TEMPLATE(debug_line);
-TP_TRACELOG_CB_TEMPLATE(debug);
+#undef LTTNG_UST_TP_TRACELOG_CB_TEMPLATE
 
-#undef TP_TRACELOG_CB_TEMPLATE
+#define lttng_ust_tracelog(level, fmt, ...)					\
+	do {								\
+		LTTNG_UST_STAP_PROBEV(tracepoint_lttng_ust_tracelog, level, ## __VA_ARGS__); \
+		if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracelog___##level.state)) \
+			lttng_ust__tracelog_##level(__FILE__, __LINE__, __func__, \
+				fmt, ## __VA_ARGS__);			\
+	} while (0)
 
-#define tracelog(level, fmt, ...)					\
+#define lttng_ust_vtracelog(level, fmt, ap)					\
 	do {								\
-		STAP_PROBEV(tracepoint_lttng_ust_tracelog, level, ## __VA_ARGS__); \
-		if (caa_unlikely(__tracepoint_lttng_ust_tracelog___## level.state)) \
-			_lttng_ust_tracelog_##level(__FILE__, __LINE__, __func__, \
-				fmt, ## __VA_ARGS__); \
+		if (caa_unlikely(lttng_ust_tracepoint_lttng_ust_tracelog___##level.state)) \
+			lttng_ust__vtracelog_##level(__FILE__, __LINE__, __func__, \
+				fmt, ap);				\
 	} while (0)
 
+#if LTTNG_UST_COMPAT_API(0)
+#define TP_TRACELOG_CB_TEMPLATE LTTNG_UST_TP_TRACELOG_CB_TEMPLATE
+#define tracelog	lttng_ust_tracelog
+#endif
+
 #ifdef __cplusplus
 }
 #endif