X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracelog.h;h=e97c827574a25329521b046b16541d4eba0be40a;hb=1698631bb3fbab41277b3953e193dd2fd4a74afa;hp=7aa8680987847ea2c76e9cae43c8aa05929dcc52;hpb=bd9bb3c77252c984f8b6a7cbfb1d6ebbd069159c;p=lttng-ust.git

diff --git a/include/lttng/tracelog.h b/include/lttng/tracelog.h
index 7aa86809..e97c8275 100644
--- a/include/lttng/tracelog.h
+++ b/include/lttng/tracelog.h
@@ -1,71 +1,68 @@
-#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:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
  *
- * 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)));
 
-TP_TRACELOG_CB_TEMPLATE(TRACE_EMERG);
-TP_TRACELOG_CB_TEMPLATE(TRACE_ALERT);
-TP_TRACELOG_CB_TEMPLATE(TRACE_CRIT);
-TP_TRACELOG_CB_TEMPLATE(TRACE_ERR);
-TP_TRACELOG_CB_TEMPLATE(TRACE_WARNING);
-TP_TRACELOG_CB_TEMPLATE(TRACE_NOTICE);
-TP_TRACELOG_CB_TEMPLATE(TRACE_INFO);
-TP_TRACELOG_CB_TEMPLATE(TRACE_DEBUG_SYSTEM);
-TP_TRACELOG_CB_TEMPLATE(TRACE_DEBUG_PROGRAM);
-TP_TRACELOG_CB_TEMPLATE(TRACE_DEBUG_PROCESS);
-TP_TRACELOG_CB_TEMPLATE(TRACE_DEBUG_MODULE);
-TP_TRACELOG_CB_TEMPLATE(TRACE_DEBUG_UNIT);
-TP_TRACELOG_CB_TEMPLATE(TRACE_DEBUG_FUNCTION);
-TP_TRACELOG_CB_TEMPLATE(TRACE_DEBUG_LINE);
-TP_TRACELOG_CB_TEMPLATE(TRACE_DEBUG);
+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);
 
-#undef TP_TRACELOG_CB_TEMPLATE
+#undef LTTNG_UST_TP_TRACELOG_CB_TEMPLATE
 
-#define tracelog(level, fmt, ...)					\
+#define lttng_ust_tracelog(level, fmt, ...)					\
 	do {								\
-		LTTNG_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__); \
+		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 vtracelog(level, fmt, ap)					\
+#define lttng_ust_vtracelog(level, fmt, ap)					\
 	do {								\
-		if (caa_unlikely(__tracepoint_lttng_ust_tracelog___##level.state)) \
-			_lttng_ust_tracelog_##level(__FILE__, __LINE__, __func__, \
-				fmt, ap); \
+		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
+#define vtracelog	lttng_ust_vtracelog
+#endif
+
 #ifdef __cplusplus
 }
 #endif