From c03208d238b0a0f8f8a6e9a7c52c2df30cad81a0 Mon Sep 17 00:00:00 2001
From: Daniel Willmann <dwillmann@sysmocom.de>
Date: Sun, 10 Jan 2021 22:14:17 +0100
Subject: WIP: Tracing

Change-Id: I78945ab2bde7c93e9461dc446809f7cbd6493100
---
 include/osmocom/core/logging.h | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

(limited to 'include/osmocom/core/logging.h')

diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h
index c7f89dea..d27c4a3c 100644
--- a/include/osmocom/core/logging.h
+++ b/include/osmocom/core/logging.h
@@ -50,10 +50,7 @@ void logp(int subsys, const char *file, int line, int cont, const char *format,
  *  \param[in] args variable argument list
  */
 #define LOGPC(ss, level, fmt, args...) \
-	do { \
-		if (log_check_level(ss, level)) \
-			logp2(ss, level, __FILE__, __LINE__, 1, fmt, ##args); \
-	} while(0)
+	LOGPSRCC(ss, level, NULL, 0, 1, fmt, ##args)
 
 /*! Log through the Osmocom logging framework with explicit source.
  *  If caller_file is passed as NULL, __FILE__ and __LINE__ are used
@@ -85,6 +82,7 @@ void logp(int subsys, const char *file, int line, int cont, const char *format,
  */
 #define LOGPSRCC(ss, level, caller_file, caller_line, cont, fmt, args...) \
 	do { \
+		TRACEPEVTSRC(ss, level, caller_file, caller_line, __func__, fmt, ##args); \
 		if (log_check_level(ss, level)) {\
 			if (caller_file) \
 				logp2(ss, level, caller_file, caller_line, cont, fmt, ##args); \
@@ -93,6 +91,33 @@ void logp(int subsys, const char *file, int line, int cont, const char *format,
 		}\
 	} while(0)
 
+#define TRACEOP_ENTFUN	"ENTER"
+#define TRACEOP_EXTFUN	"EXIT"
+#define TRACEOP_ATTR	"ATTR"
+#define TRACEOP_EVT	"EVT"
+
+#define TRACEP(ss, oper, fmt, args...) \
+	TRACEPSRC(ss, oper, NULL, 0, (const char *)NULL, fmt, ##args)
+#define TRACEPSRC(ss, oper, caller_file, caller_line, caller_func, fmt, args...) \
+	do { \
+		if (log_check_level(DLTRACE, LOGL_DEBUG)) {\
+			if (caller_file) \
+				logp2(DLTRACE, LOGL_DEBUG, caller_file, caller_line, 0, "[" oper " func=%s ss=%02x]%s" fmt, caller_func, ss, fmt[0]?" ":"", ##args); \
+			else \
+				logp2(DLTRACE, LOGL_DEBUG, __FILE__, __LINE__, 0, "[" oper " func=%s ss=%02x]%s" fmt, __func__, ss, fmt[0]?" ":"", ##args); \
+		}\
+	} while(0)
+
+#define TRACEPENTFUN(ss, fmt, args...) \
+	TRACEP(ss, TRACEOP_ENTFUN, fmt, ##args)
+#define TRACEPEXTFUN(ss, fmt, args...) \
+	TRACEP(ss, TRACEOP_EXTFUN, fmt, ##args)
+#define TRACEPATTR(ss, fmt, args...) \
+	TRACEP(ss, TRACEOP_ATTR, fmt, ##args)
+#define TRACEPEVTSRC(ss, level, caller_file, caller_line, caller_func, fmt, args...) \
+	TRACEPSRC(ss, TRACEOP_EVT, caller_file, caller_line, caller_func, "level=%02x " fmt, level, ##args)
+
+
 /*! different log levels */
 #define LOGL_DEBUG	1	/*!< debugging information */
 #define LOGL_INFO	3	/*!< general information */
@@ -122,7 +147,8 @@ void logp(int subsys, const char *file, int line, int cont, const char *format,
 #define DLRSPRO		-19	/*!< Osmocom Remote SIM Protocol */
 #define DLNS		-20	/*!< Osmocom NS layer */
 #define DLBSSGP		-21	/*!< Osmocom BSSGP layer */
-#define OSMO_NUM_DLIB	21	/*!< Number of logging sub-systems in libraries */
+#define DLTRACE		-22	/*!< Osmocom Tracing messages (intended for GSMTAP logging) */
+#define OSMO_NUM_DLIB	22	/*!< Number of logging sub-systems in libraries */
 
 /* Colors that can be used in log_info_cat.color */
 #define OSMO_LOGCOLOR_NORMAL NULL
-- 
cgit v1.2.3